equal
deleted
inserted
replaced
19 """ |
19 """ |
20 import unittest |
20 import unittest |
21 import os |
21 import os |
22 import shutil |
22 import shutil |
23 import zipfile |
23 import zipfile |
24 import __init__ |
24 |
25 from testautomation.base_testcase import BaseTestCase |
25 from testautomation.base_testcase import BaseTestCase |
26 from testautomation import unzip_file |
26 from testautomation import unzip_file |
27 from scripttest_common import get_cmd |
27 from scripttest_common import get_cmd |
28 |
28 |
29 try: |
29 try: |
84 return test_project_dir, expected_dir |
84 return test_project_dir, expected_dir |
85 |
85 |
86 def test_get_help(self): |
86 def test_get_help(self): |
87 cmd = '%s -h' % get_cmd('merge') |
87 cmd = '%s -h' % get_cmd('merge') |
88 out = self.run_command(cmd) |
88 out = self.run_command(cmd) |
89 lines = out.split('\r\n') |
89 lines = out.split(os.linesep) |
90 self.assertTrue('Options:' in lines) |
90 self.assertTrue('Options:' in lines) |
91 self.assertTrue(' Merge options:' in lines) |
91 self.assertTrue(' Merge options:' in lines) |
92 |
92 |
93 def test_merge_cpf_last_layer_to_project(self): |
93 def test_merge_cpf_last_layer_to_project(self): |
94 project_dir, expected_dir = self._prepare_workdir_with_project('last_layer_from_cpf', 'last_layer_expected.zip') |
94 project_dir, expected_dir = self._prepare_workdir_with_project('last_layer_from_cpf', 'last_layer_expected.zip') |