Set defaut provider to local back

It apply the same rules as sonuoboy.
Any user is free to set skeleton or something else via testcases.yml.

Change-Id: Id999dfd5fbcf9bde9430e0f35c63c41e80c8044f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit b100b1254e06719bf1c779b9d53d0ac2da67fca4)

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index 2d17a27..a0a957d 100644 (file)
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -60,7 +60,8 @@ class E2ETesting(testcase.TestCase):
             'ginkgo', '--nodes={}'.format(kwargs.get("nodes", 1)),
             '--noColor', '/usr/local/bin/e2e.test', '--',
             '-kubeconfig', self.config,
-            '-provider', 'skeleton', '-report-dir', self.res_dir]
+            '-provider', kwargs.get('provider', 'local'),
+            '-report-dir', self.res_dir]
         for arg in kwargs.get("ginkgo", {}):
             cmd_line.extend(['-ginkgo.{}'.format(arg), kwargs["ginkgo"][arg]])
         for key, value in self.convert_ini_to_dict(
@@ -78,7 +79,7 @@ class E2ETesting(testcase.TestCase):
                                    stderr=subprocess.STDOUT, env=env)
         boutput = process.stdout.read()
         with open(os.path.join(self.res_dir, 'e2e.log'), 'wb') as foutput:
-            foutput.write(boutput)
+            foutput.write(boutput.decode("utf-8"))
         grp = re.search(
             r'^(FAIL|SUCCESS)!.* ([0-9]+) Passed \| ([0-9]+) Failed \|'
             r' ([0-9]+) Pending \| ([0-9]+) Skipped',