From 537911391a62a6e9b7809986b28e159bcd510717 Mon Sep 17 00:00:00 2001 From: tete1987 <69782329+tete1987@users.noreply.github.com> Date: Mon, 1 Feb 2021 14:43:08 +0800 Subject: [PATCH 1/8] Update web_ut.py --- test/web_ut.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/web_ut.py b/test/web_ut.py index 9aebada..b95de1e 100644 --- a/test/web_ut.py +++ b/test/web_ut.py @@ -14,7 +14,7 @@ class ISelenium(unittest.TestCase): # 读入配置文件 def get_config(self): config = configparser.ConfigParser() - config.read(os.path.join(os.environ['HOME'], 'iselenium.ini')) + config.read(os.path.join(os.environ['HOMEPATH'], 'iselenium.ini')) return config def tearDown(self): @@ -35,8 +35,9 @@ def setUp(self): print('使用无界面方式运行') chrome_options.add_argument("--headless") - self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), - options=chrome_options) +# self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), +# options=chrome_options) + self.driver = webdriver.Chrome(options=chrome_options) @allure.story('Test key word 今日头条') def test_webui_1(self): From 82aa5796da74ce2f271ed5b5ee6409bb3ed5f219 Mon Sep 17 00:00:00 2001 From: tete1987 <69782329+tete1987@users.noreply.github.com> Date: Mon, 1 Feb 2021 14:45:35 +0800 Subject: [PATCH 2/8] Update web_ut.py --- test/web_ut.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/web_ut.py b/test/web_ut.py index b95de1e..37a1d40 100644 --- a/test/web_ut.py +++ b/test/web_ut.py @@ -35,9 +35,9 @@ def setUp(self): print('使用无界面方式运行') chrome_options.add_argument("--headless") -# self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), -# options=chrome_options) - self.driver = webdriver.Chrome(options=chrome_options) + self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), + options=chrome_options) +# self.driver = webdriver.Chrome(options=chrome_options) @allure.story('Test key word 今日头条') def test_webui_1(self): From d68a548223253d88118fbe273468e8b82082b0dc Mon Sep 17 00:00:00 2001 From: tete1987 <69782329+tete1987@users.noreply.github.com> Date: Mon, 1 Feb 2021 14:53:49 +0800 Subject: [PATCH 3/8] Update web_ut.py --- test/web_ut.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/web_ut.py b/test/web_ut.py index 37a1d40..323924b 100644 --- a/test/web_ut.py +++ b/test/web_ut.py @@ -12,10 +12,10 @@ @allure.feature('Test Baidu WebUI') class ISelenium(unittest.TestCase): # 读入配置文件 - def get_config(self): - config = configparser.ConfigParser() - config.read(os.path.join(os.environ['HOMEPATH'], 'iselenium.ini')) - return config +# def get_config(self): +# config = configparser.ConfigParser() +# config.read(os.path.join(os.environ['HOMEPATH'], 'iselenium.ini')) +# return config def tearDown(self): self.driver.quit() @@ -35,9 +35,9 @@ def setUp(self): print('使用无界面方式运行') chrome_options.add_argument("--headless") - self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), - options=chrome_options) -# self.driver = webdriver.Chrome(options=chrome_options) +# self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), +# options=chrome_options) + self.driver = webdriver.Chrome(options=chrome_options) @allure.story('Test key word 今日头条') def test_webui_1(self): From bc93f89adc93a52830edd748c5a862065520b648 Mon Sep 17 00:00:00 2001 From: tete1987 <279265224@qq.com> Date: Mon, 1 Feb 2021 15:06:06 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E2=80=9C=E4=BF=AE=E6=94=B9=E7=BC=A9?= =?UTF-8?q?=E8=BF=9B=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/web_ut.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/web_ut.py b/test/web_ut.py index 323924b..28c0986 100644 --- a/test/web_ut.py +++ b/test/web_ut.py @@ -12,10 +12,10 @@ @allure.feature('Test Baidu WebUI') class ISelenium(unittest.TestCase): # 读入配置文件 -# def get_config(self): -# config = configparser.ConfigParser() -# config.read(os.path.join(os.environ['HOMEPATH'], 'iselenium.ini')) -# return config + def get_config(self): + config = configparser.ConfigParser() + config.read(os.path.join(os.environ['HOMEPATH'], 'iselenium.ini')) + return config def tearDown(self): self.driver.quit() @@ -37,7 +37,7 @@ def setUp(self): # self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), # options=chrome_options) - self.driver = webdriver.Chrome(options=chrome_options) + self.driver = webdriver.Chrome(options=chrome_options) @allure.story('Test key word 今日头条') def test_webui_1(self): From 2182a02db88cd484f31a38069b13c64e46595ca3 Mon Sep 17 00:00:00 2001 From: tete1987 <69782329+tete1987@users.noreply.github.com> Date: Mon, 1 Feb 2021 15:13:37 +0800 Subject: [PATCH 5/8] Update web_ut.py --- test/web_ut.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/web_ut.py b/test/web_ut.py index 28c0986..81f787b 100644 --- a/test/web_ut.py +++ b/test/web_ut.py @@ -35,8 +35,6 @@ def setUp(self): print('使用无界面方式运行') chrome_options.add_argument("--headless") -# self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), -# options=chrome_options) self.driver = webdriver.Chrome(options=chrome_options) @allure.story('Test key word 今日头条') From 5448423d78bd853466e0ebad88ed45a8f99e3cb7 Mon Sep 17 00:00:00 2001 From: tete1987 <69782329+tete1987@users.noreply.github.com> Date: Mon, 1 Feb 2021 15:16:21 +0800 Subject: [PATCH 6/8] Update web_ut.py --- test/web_ut.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/web_ut.py b/test/web_ut.py index 81f787b..5c2b6de 100644 --- a/test/web_ut.py +++ b/test/web_ut.py @@ -35,7 +35,7 @@ def setUp(self): print('使用无界面方式运行') chrome_options.add_argument("--headless") - self.driver = webdriver.Chrome(options=chrome_options) + self.driver = webdriver.Chrome(options=chrome_options) @allure.story('Test key word 今日头条') def test_webui_1(self): From 2c51915ca8978ab1a27ab7ada0276ec6ebed4a77 Mon Sep 17 00:00:00 2001 From: tete1987 <69782329+tete1987@users.noreply.github.com> Date: Mon, 1 Feb 2021 15:18:59 +0800 Subject: [PATCH 7/8] Update web_ut.py --- test/web_ut.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/web_ut.py b/test/web_ut.py index 5c2b6de..c11d462 100644 --- a/test/web_ut.py +++ b/test/web_ut.py @@ -34,7 +34,6 @@ def setUp(self): if using_headless is not None and using_headless.lower() == 'true': print('使用无界面方式运行') chrome_options.add_argument("--headless") - self.driver = webdriver.Chrome(options=chrome_options) @allure.story('Test key word 今日头条') From 6ff38a9bb115928fe26b9bbb5a6fba8eacef089d Mon Sep 17 00:00:00 2001 From: tete1987 <279265224@qq.com> Date: Mon, 1 Feb 2021 15:20:53 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E2=80=9C=E4=BF=AE=E6=94=B9=E7=BC=A9?= =?UTF-8?q?=E8=BF=9B=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/web_ut.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/web_ut.py b/test/web_ut.py index 323924b..81f787b 100644 --- a/test/web_ut.py +++ b/test/web_ut.py @@ -12,10 +12,10 @@ @allure.feature('Test Baidu WebUI') class ISelenium(unittest.TestCase): # 读入配置文件 -# def get_config(self): -# config = configparser.ConfigParser() -# config.read(os.path.join(os.environ['HOMEPATH'], 'iselenium.ini')) -# return config + def get_config(self): + config = configparser.ConfigParser() + config.read(os.path.join(os.environ['HOMEPATH'], 'iselenium.ini')) + return config def tearDown(self): self.driver.quit() @@ -35,9 +35,7 @@ def setUp(self): print('使用无界面方式运行') chrome_options.add_argument("--headless") -# self.driver = webdriver.Chrome(executable_path=config.get('driver', 'chrome_driver'), -# options=chrome_options) - self.driver = webdriver.Chrome(options=chrome_options) + self.driver = webdriver.Chrome(options=chrome_options) @allure.story('Test key word 今日头条') def test_webui_1(self):