wordpress-charmers team mailing list archive

[Paul Collins <paul.collins@xxxxxxxxxxxxx>]

Paul Collins has proposed merging ~pjdc/charm-k8s-wordpress/+git/charm-k8s-wordpress:no-custom-meta into charm-k8s-wordpress:master.

Commit message:
don't pass meta to testing.Harness; fix test_is_config_valid for tls_secret_name

Requested reviews:
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~pjdc/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/384795
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~pjdc/charm-k8s-wordpress/+git/charm-k8s-wordpress:no-custom-meta into charm-k8s-wordpress:master.

diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index f0578cd..f2cba7f 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -19,12 +19,7 @@ class TestWordpressK8sCharm(unittest.TestCase):
     test_model_config = TEST_MODEL_CONFIG
 
     def setUp(self):
-        self.harness = testing.Harness(
-            WordpressK8sCharm,
-            meta='''
-            name: wordpress
-            ''',
-        )
+        self.harness = testing.Harness(WordpressK8sCharm)
 
         self.harness.begin()
         self.harness.charm.model.config = copy.deepcopy(self.test_model_config)
diff --git a/tests/unit/test_wordpress.py b/tests/unit/test_wordpress.py
index af417ec..32fdb43 100644
--- a/tests/unit/test_wordpress.py
+++ b/tests/unit/test_wordpress.py
@@ -28,6 +28,7 @@ TEST_MODEL_CONFIG = {
     admin_email: root@xxxxxxxxxxxxxxxxxxx
     weblog_title: Test Blog
     blog_public: False""",
+    "tls_secret_name": "wordpress-tls",
 }