commit b2c234b2056b9d8cb9f6eda268c2cf1845f88371
author Adam Israel <adam.israel@canonical.com> Fri Apr 05 10:17:25 2019 -0400
committer Adam Israel <adam.israel@canonical.com> Fri Apr 05 10:23:45 2019 -0400
tree 283483b484519918ac3958216c3af42417a73ae8
parent caf6efba68120623038efc361cf46e1f60de452b

Bug 666: Fix window_size overflow with Paramiko

This commit fixes integration testing around bug fixes in the sshproxy
layer that were causing a window_size overflow.

This also improves reliability around testing machine charms, by
verifying the sshd service is running inside the target machine (lxd)
before running tests.

Change-Id: I465d51521bf87b8e4b3dc5cac07c163fac836393
Signed-off-by: Adam Israel <adam.israel@canonical.com>

tests/integration/test_charm_native.py

diff --git a/tests/integration/test_charm_native.py b/tests/integration/test_charm_native.py
index 85a282e..7b2bda9 100644
--- a/tests/integration/test_charm_native.py
+++ b/tests/integration/test_charm_native.py
@@ -137,5 +137,4 @@
                 await asyncio.sleep(15)
 
             print("test_charm_native stopped")
-
         return 'ok'

tests/integration/test_metrics_proxy.py

diff --git a/tests/integration/test_metrics_proxy.py b/tests/integration/test_metrics_proxy.py
index e7fa920..81501b0 100644
--- a/tests/integration/test_metrics_proxy.py
+++ b/tests/integration/test_metrics_proxy.py
@@ -109,7 +109,14 @@
                 juju:
                     charm: metrics-proxy-ci
                     proxy: true
-    """
+                initial-config-primitive:
+                -   seq: '1'
+                    name: run
+                    parameter:
+                    -   name: command
+                        data-type: STRING
+                        value: hostname
+"""
 
     # @pytest.mark.serial
     @pytest.mark.asyncio

tests/integration/test_non_string_parameter.py

diff --git a/tests/integration/test_non_string_parameter.py b/tests/integration/test_non_string_parameter.py
index b93dfed..e15b790 100644
--- a/tests/integration/test_non_string_parameter.py
+++ b/tests/integration/test_non_string_parameter.py
@@ -13,9 +13,9 @@
     NSD_YAML = """
     nsd:nsd-catalog:
         nsd:
-        -   id: charmnative-ns
-            name: charmnative-ns
-            short-name: charmnative-ns
+        -   id: nonstring-ns
+            name: nonstring-ns
+            short-name: nonstring-ns
             description: NS with 1 VNFs charmnative-vnf connected by datanet and mgmtnet VLs
             version: '1.0'
             logo: osm.png
@@ -143,5 +143,5 @@
                 print("Waiting for test to finish...")
                 await asyncio.sleep(15)
             logging.debug("test_charm_non_string_parameter stopped")
-
+            # assert False
         return 'ok'