From f2b1d1ade4110c784104a6ffad2710dc57d7c1ec Mon Sep 17 00:00:00 2001 From: Robin Randhawa Date: Sat, 23 Jan 2016 11:11:10 +0000 Subject: [PATCH 1/2] multiple: Minor spelling fixes Signed-off-by: Robin Randhawa --- ipynb/devlib/examples/cgroups.ipynb | 2 +- ipynb/sched_dvfs/smoke_test.ipynb | 2 +- ipynb/trappy/example_custom_events.ipynb | 2 +- ipynb/utils/testenv_example.ipynb | 4 ++-- ipynb/wlgen/rtapp_examples.ipynb | 2 +- ipynb/wlgen/simple_rtapp.ipynb | 2 +- libs/utils/env.py | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ipynb/devlib/examples/cgroups.ipynb b/ipynb/devlib/examples/cgroups.ipynb index 26b6e2a9a..7c154b43d 100644 --- a/ipynb/devlib/examples/cgroups.ipynb +++ b/ipynb/devlib/examples/cgroups.ipynb @@ -88,7 +88,7 @@ "output_type": "stream", "text": [ "06:18:54 INFO : Target - Using base path: /home/derkling/Code/schedtest\n", - "06:18:54 INFO : Target - Connecing linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", + "06:18:54 INFO : Target - Connecting linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", "06:19:00 INFO : Available controllers: ['cpuset', 'cpu', 'memory', 'hugetlb']\n", "06:19:01 INFO : Controller cpuset mounted under: /sys/fs/cgroup/devlib_cpuset\n", "06:19:04 INFO : Controller cpu mounted under: /sys/fs/cgroup/devlib_cpu\n", diff --git a/ipynb/sched_dvfs/smoke_test.ipynb b/ipynb/sched_dvfs/smoke_test.ipynb index a1f3195ab..8b6260ca4 100644 --- a/ipynb/sched_dvfs/smoke_test.ipynb +++ b/ipynb/sched_dvfs/smoke_test.ipynb @@ -150,7 +150,7 @@ "text": [ "04:22:20 INFO : Target - Using base path: /home/derkling/Code/schedtest\n", "04:22:20 INFO : %14s - Loading custom (inline) target configuration\n", - "04:22:20 INFO : Target - Connecing linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", + "04:22:20 INFO : Target - Connecting linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", "04:22:57 INFO : Target - Initializing target workdir [/root/devlib-target]\n", "04:23:01 INFO : Target topology: [[0, 3, 4, 5], [1, 2]]\n", "04:23:03 INFO : FTrace - Enabled events:\n", diff --git a/ipynb/trappy/example_custom_events.ipynb b/ipynb/trappy/example_custom_events.ipynb index 82ceae654..9b3b9cb0e 100644 --- a/ipynb/trappy/example_custom_events.ipynb +++ b/ipynb/trappy/example_custom_events.ipynb @@ -181,7 +181,7 @@ "text": [ "05:26:51 INFO : Target - Using base path: /home/derkling/Code/schedtest\n", "05:26:51 INFO : %14s - Loading custom (inline) target configuration\n", - "05:26:51 INFO : Target - Connecing linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", + "05:26:51 INFO : Target - Connecting linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", "05:26:55 INFO : Target - Initializing target workdir [/root/devlib-target]\n", "05:26:58 INFO : Target topology: [[0, 3, 4, 5], [1, 2]]\n", "05:27:00 INFO : FTrace - Enabled events:\n", diff --git a/ipynb/utils/testenv_example.ipynb b/ipynb/utils/testenv_example.ipynb index 3c9c7725f..cdb852d35 100644 --- a/ipynb/utils/testenv_example.ipynb +++ b/ipynb/utils/testenv_example.ipynb @@ -92,7 +92,7 @@ "output_type": "stream", "text": [ "07:16:29 INFO : Target - Using base path: /home/derkling/Code/schedtest\n", - "07:16:29 INFO : Target - Connecing linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", + "07:16:29 INFO : Target - Connecting linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", "07:16:29 DEBUG : Logging in root@192.168.0.10\n", "07:16:31 DEBUG : echo $PATH\n", "07:16:31 DEBUG : ls -1 /usr/local/bin\n", @@ -614,7 +614,7 @@ "text": [ "07:17:22 DEBUG : sudo -- sh -c 'sleep 2 && reboot -f &'\n", "07:17:23 INFO : Reboot - Waiting 60 [s]for target to reboot...\n", - "07:18:23 INFO : Target - Connecing linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", + "07:18:23 INFO : Target - Connecting linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", "07:18:23 DEBUG : Logging in root@192.168.0.10\n", "07:18:24 DEBUG : echo $PATH\n", "07:18:24 DEBUG : ls -1 /usr/local/bin\n", diff --git a/ipynb/wlgen/rtapp_examples.ipynb b/ipynb/wlgen/rtapp_examples.ipynb index ac321aa19..9551612df 100644 --- a/ipynb/wlgen/rtapp_examples.ipynb +++ b/ipynb/wlgen/rtapp_examples.ipynb @@ -68,7 +68,7 @@ "text": [ "03:34:27 INFO : Target - Using base path: /home/derkling/Code/schedtest\n", "03:34:27 INFO : Target - Loading custom (inline) target configuration\n", - "03:34:27 INFO : Target - Connecing host target with: {'username': 'derkling', 'password': ''}\n" + "03:34:27 INFO : Target - Connecting host target with: {'username': 'derkling', 'password': ''}\n" ] }, { diff --git a/ipynb/wlgen/simple_rtapp.ipynb b/ipynb/wlgen/simple_rtapp.ipynb index 5172713bf..0ac5f94c8 100644 --- a/ipynb/wlgen/simple_rtapp.ipynb +++ b/ipynb/wlgen/simple_rtapp.ipynb @@ -143,7 +143,7 @@ "text": [ "04:35:52 INFO : Target - Using base path: /home/derkling/Code/schedtest\n", "04:35:52 INFO : %14s - Loading custom (inline) target configuration\n", - "04:35:52 INFO : Target - Connecing linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", + "04:35:52 INFO : Target - Connecting linux target with: {'username': 'root', 'host': '192.168.0.10', 'password': ''}\n", "04:35:52 DEBUG : Logging in root@192.168.0.10\n", "04:35:54 DEBUG : echo $PATH\n", "04:35:54 DEBUG : ls -1 /usr/local/bin\n", diff --git a/libs/utils/env.py b/libs/utils/env.py index dc5675060..3f851db57 100644 --- a/libs/utils/env.py +++ b/libs/utils/env.py @@ -293,10 +293,10 @@ class TestEnv(ShareState): self.__connection_settings = None if 'device' in self.conf: self.__connection_settings['device'] = self.conf['device'] - logging.info(r'%14s - Connecing Android target [%s]', + logging.info(r'%14s - Connecting Android target [%s]', 'Target', self.__connection_settings or 'DEFAULT') else: - logging.info(r'%14s - Connecing %s target with: %s', + logging.info(r'%14s - Connecting %s target with: %s', 'Target', platform_type, self.__connection_settings) if platform_type.lower() == 'linux': -- GitLab From f59c5bb7a8db4634d674b6d70008841df25a0c06 Mon Sep 17 00:00:00 2001 From: Robin Randhawa Date: Mon, 25 Jan 2016 12:30:54 +0000 Subject: [PATCH 2/2] libs/utils/env: Recognise port specification Without this, a port specification in a target configuration would be ignored leading to connection failure. Signed-off-by: Robin Randhawa --- libs/utils/env.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/utils/env.py b/libs/utils/env.py index 3f851db57..06d465813 100644 --- a/libs/utils/env.py +++ b/libs/utils/env.py @@ -258,6 +258,10 @@ class TestEnv(ShareState): else: self.__connection_settings['password'] = PASSWORD_DEFAULT + # Configure port + if 'port' in self.conf: + self.__connection_settings['port'] = self.conf['port'] + # Configure the host IP/MAC address if 'host' in self.conf: try: -- GitLab