Merge "Consolidate to a single separator character"

2016-09-16 13:52:46 +00:00
parent be9c5d49e4 26c427450b
commit 71be556ab5
32 changed files with 45 additions and 43 deletions
--- a/git_upstream/tests/base.py
+++ b/git_upstream/tests/base.py
@@ -104,6 +104,9 @@ def get_scenarios(scenarios_path):
                filename = os.path.join(root, f)
                with io.open(filename, 'r', encoding='utf-8') as yaml_file:
                    data = yaml.load(yaml_file)[0]
+                # convert any keys with dashes to underscores for easy access
+                data = {key.replace('-', '_'): value
+                        for key, value in data.items()}
                test_name = os.path.splitext(
                    os.path.relpath(filename, scenarios_path))[0]
                data['name'] = test_name
@@ -345,7 +348,7 @@ class BaseTestCase(testtools.TestCase):
            self.gittree = BuildTree(
                self.testrepo, self.tree, self.branches.values())

-        if hasattr(self, 'pre-script'):
+        if hasattr(self, 'pre_script'):
            self.run_pre_script()

    def run_pre_script(self):
@@ -359,7 +362,7 @@ class BaseTestCase(testtools.TestCase):
        # ensure we execute within context of the git repository
        with DiveDir(self.testrepo.path):
            try:
-                output = subprocess.check_output(getattr(self, 'pre-script'),
+                output = subprocess.check_output(self.pre_script,
                                                 stderr=subprocess.STDOUT,
                                                 shell=True)
            except subprocess.CalledProcessError as e:
--- a/git_upstream/tests/commands/import/interactive_scenarios/basic.yaml
+++ b/git_upstream/tests/commands/import/interactive_scenarios/basic.yaml
@@ -36,6 +36,6 @@
    head: [master, D]
    upstream: [upstream/master, F]

-  parser_args: [-v, import, -i, upstream/master]
+  parser-args: [-v, import, -i, upstream/master]

-  expect_rebased: [C, D]
+  expect-rebased: [C, D]
--- a/git_upstream/tests/commands/import/interactive_scenarios/import_no_merge.yaml
+++ b/git_upstream/tests/commands/import/interactive_scenarios/import_no_merge.yaml
@@ -54,7 +54,7 @@
    head: [master, D]
    upstream: [custom/master, F]

-  parser_args:
+  parser-args:
    - -q
    - import
    - --no-merge
@@ -62,4 +62,4 @@
    - --into=master
    - custom/master

-  check_merge: False
+  check-merge: False
--- a/git_upstream/tests/commands/import/scenarios/basic.yaml
+++ b/git_upstream/tests/commands/import/scenarios/basic.yaml
@@ -36,4 +36,4 @@
    head: [master, D]
    upstream: [upstream/master, F]

-  parser_args: [-q, import, upstream/master]
+  parser-args: [-q, import, upstream/master]
--- a/git_upstream/tests/commands/import/scenarios/basic_additional.yaml
+++ b/git_upstream/tests/commands/import/scenarios/basic_additional.yaml
@@ -43,4 +43,4 @@
    upstream: [upstream/master, H]
    packaging: [packaging/master, D]

-  parser_args: [-q, import, upstream/master, packaging/master]
+  parser-args: [-q, import, upstream/master, packaging/master]
--- a/git_upstream/tests/commands/import/scenarios/basic_additional_missed.yaml
+++ b/git_upstream/tests/commands/import/scenarios/basic_additional_missed.yaml
@@ -44,4 +44,4 @@
    upstream: [upstream/master, H]
    packaging: [packaging/master, D]

-  parser_args: [import, upstream/master]
+  parser-args: [import, upstream/master]
--- a/git_upstream/tests/commands/import/scenarios/import_everything_already_upstreamed.yaml
+++ b/git_upstream/tests/commands/import/scenarios/import_everything_already_upstreamed.yaml
@@ -39,10 +39,10 @@
    head: [master, D]
    upstream: [upstream/master, D1]

-  parser_args:
+  parser-args:
    - -q
    - import
    - --into=master
    - upstream/master

-  expect_found: []
+  expect-found: []
--- a/git_upstream/tests/commands/import/scenarios/import_finish.yaml
+++ b/git_upstream/tests/commands/import/scenarios/import_finish.yaml
@@ -56,7 +56,7 @@
    upstream: [custom/master, F]
    import: [import/F, D1]

-  parser_args:
+  parser-args:
    - -q
    - import
    - --finish
--- a/git_upstream/tests/commands/import/scenarios/import_same_as_previous_upstream.yaml
+++ b/git_upstream/tests/commands/import/scenarios/import_same_as_previous_upstream.yaml
@@ -35,10 +35,10 @@
    head: [master, D]
    upstream: [upstream/master, B]

-  parser_args:
+  parser-args:
    - -q
    - import
    - --into=master

-  expect_found: []
-  check_merge: False
+  expect-found: []
+  check-merge: False
--- a/git_upstream/tests/commands/import/scenarios/import_same_previous_with_diff_additional.yaml
+++ b/git_upstream/tests/commands/import/scenarios/import_same_previous_with_diff_additional.yaml
@@ -45,7 +45,7 @@
    additional_1: [additional/1, G]
    additional_2: [additional/2, F]

-  parser_args:
+  parser-args:
    - -q
    - import
    - --into=master
@@ -53,4 +53,4 @@
    - additional/1
    - additional/2

-  expect_found: [E, G, F,MERGE, D]
+  expect-found: [E, G, F,MERGE, D]
--- a/git_upstream/tests/commands/import/scenarios/import_same_previous_with_same_additional.yaml
+++ b/git_upstream/tests/commands/import/scenarios/import_same_previous_with_same_additional.yaml
@@ -44,7 +44,7 @@
    additional_1: [additional/1, E]
    additional_2: [additional/2, F]

-  parser_args:
+  parser-args:
    - -q
    - import
    - --into=master
@@ -52,5 +52,5 @@
    - additional/1
    - additional/2

-  expect_found: []
-  check_merge: False
+  expect-found: []
+  check-merge: False
--- a/git_upstream/tests/commands/import/scenarios/import_switch_branches_incorrect_without_search_ref.yaml
+++ b/git_upstream/tests/commands/import/scenarios/import_switch_branches_incorrect_without_search_ref.yaml
@@ -59,4 +59,4 @@
    upstream: [custom/master, H]
    stable: [custom/stable, D]

-  parser_args: [-q, import, --into=master, custom/master]
+  parser-args: [-q, import, --into=master, custom/master]
--- a/git_upstream/tests/commands/import/scenarios/import_switch_branches_search.yaml
+++ b/git_upstream/tests/commands/import/scenarios/import_switch_branches_search.yaml
@@ -57,6 +57,6 @@
    upstream: [upstream/master, H]
    stable: [upstream/stable, D]

-  parser_args: [-q, import]
+  parser-args: [-q, import]

-  expect_found: [E, F]
+  expect-found: [E, F]
--- a/git_upstream/tests/commands/import/scenarios/import_switch_branches_search_ref_custom_namespace.yaml
+++ b/git_upstream/tests/commands/import/scenarios/import_switch_branches_search_ref_custom_namespace.yaml
@@ -58,7 +58,7 @@
    upstream: [custom/master, H]
    stable: [custom/stable, D]

-  parser_args:
+  parser-args:
    - -q
    - import
    - --search-refs=custom/*
--- a/git_upstream/tests/searchers/scenarios/addition_branch.yaml
+++ b/git_upstream/tests/searchers/scenarios/addition_branch.yaml
@@ -41,4 +41,4 @@
      head: [master, E]
      upstream: [upstream/master, G]

-  expected_changes: [C, D, E]
+  expected-changes: [C, D, E]
--- a/git_upstream/tests/searchers/scenarios/additional_branch_multiple_imports.yaml
+++ b/git_upstream/tests/searchers/scenarios/additional_branch_multiple_imports.yaml
@@ -52,4 +52,4 @@
        head: [master, K]
        upstream: [upstream/master, M]

-  expected_changes: [H, D1, E1, I, J, K]
+  expected-changes: [H, D1, E1, I, J, K]
--- a/git_upstream/tests/searchers/scenarios/ambiguous_argument.yaml
+++ b/git_upstream/tests/searchers/scenarios/ambiguous_argument.yaml
@@ -48,7 +48,7 @@
    head: [master, G]
    upstream: [upstream/master, E]

-  expected_changes: [B1, C1, F, G]
+  expected-changes: [B1, C1, F, G]

  pre-script: |
    #!/bin/sh
--- a/git_upstream/tests/searchers/scenarios/basic.yaml
+++ b/git_upstream/tests/searchers/scenarios/basic.yaml
@@ -35,4 +35,4 @@
    head: [master, B]
    upstream: [upstream/master, D]

-  expected_changes: [B]
+  expected-changes: [B]
--- a/git_upstream/tests/searchers/scenarios/change_merged_after_merge_base_no_previous_import.yaml
+++ b/git_upstream/tests/searchers/scenarios/change_merged_after_merge_base_no_previous_import.yaml
@@ -46,5 +46,4 @@
    head: [master, G]
    upstream: [upstream/master, I]

-  expected_changes: [B, E, F, G]
-
+  expected-changes: [B, E, F, G]
--- a/git_upstream/tests/searchers/scenarios/changes_approved_after_import_merge.yaml
+++ b/git_upstream/tests/searchers/scenarios/changes_approved_after_import_merge.yaml
@@ -60,4 +60,4 @@
    head: [master, K]
    upstream: [upstream/master, M]

-  expected_changes: [B1, C1, D1, G, O, H, I, J, K]
+  expected-changes: [B1, C1, D1, G, O, H, I, J, K]
--- a/git_upstream/tests/searchers/scenarios/changes_merge_result_identical_on_both_sides.yaml
+++ b/git_upstream/tests/searchers/scenarios/changes_merge_result_identical_on_both_sides.yaml
@@ -54,4 +54,4 @@
    head: [master, J]
    upstream: [upstream/master, L]

-  expected_changes: [B1, C1, D1, G1, H, I, J]
+  expected-changes: [B1, C1, D1, G1, H, I, J]
--- a/git_upstream/tests/searchers/scenarios/changes_merge_result_identical_to_previous.yaml
+++ b/git_upstream/tests/searchers/scenarios/changes_merge_result_identical_to_previous.yaml
@@ -55,4 +55,4 @@
    head: [master, K]
    upstream: [upstream/master, M]

-  expected_changes: [B1, C1, D1, G1, H, I, J, K]
+  expected-changes: [B1, C1, D1, G1, H, I, J, K]
--- a/git_upstream/tests/searchers/scenarios/changes_upload_prior_to_import.yaml
+++ b/git_upstream/tests/searchers/scenarios/changes_upload_prior_to_import.yaml
@@ -60,4 +60,4 @@
    head: [master, Q]
    upstream: [upstream/master, M]

-  expected_changes: [H, D1, E1, I, J, K, O, P, Q]
+  expected-changes: [H, D1, E1, I, J, K, O, P, Q]
--- a/git_upstream/tests/searchers/scenarios/multi_changes_upload_prior_to_import.yaml
+++ b/git_upstream/tests/searchers/scenarios/multi_changes_upload_prior_to_import.yaml
@@ -59,4 +59,4 @@
  branches:
    head: [master, P]
    upstream: [upstream/master, R]
-  expected_changes: [H, D1, E1, I, J, K, L, M, O, P]
+  expected-changes: [H, D1, E1, I, J, K, L, M, O, P]
--- a/git_upstream/tests/searchers/scenarios/old_style_merge_replace_first.yaml
+++ b/git_upstream/tests/searchers/scenarios/old_style_merge_replace_first.yaml
@@ -49,4 +49,4 @@
    upstream: [upstream/master, I]
    packaging: [packaging, B]

-  expected_changes: [H, D1, E1]
+  expected-changes: [H, D1, E1]
--- a/git_upstream/tests/searchers/scenarios/switch_tracked_branches.yaml
+++ b/git_upstream/tests/searchers/scenarios/switch_tracked_branches.yaml
@@ -49,6 +49,6 @@
    stable: [upstream/stable, I]
    upstream: [upstream/master, H]

-  expected_changes: [B1, J]
+  expected-changes: [B1, J]

  pattern: upstream/*
--- a/git_upstream/tests/searchers/scenarios/switch_tracked_branches_incorrect.yaml
+++ b/git_upstream/tests/searchers/scenarios/switch_tracked_branches_incorrect.yaml
@@ -52,6 +52,6 @@
    stable: [upstream/stable, I]
    upstream: [upstream/master, H]

-  expected_changes: [E, I, B1, J]
+  expected-changes: [E, I, B1, J]

  pattern: upstream/master
--- a/git_upstream/tests/strategies/scenarios/locate_changes_walk_additional_branch.yaml
+++ b/git_upstream/tests/strategies/scenarios/locate_changes_walk_additional_branch.yaml
@@ -41,5 +41,5 @@
    head: [master, E]
    upstream: [upstream/master, G]

-  expected_changes: [D, E]
+  expected-changes: [D, E]

--- a/git_upstream/tests/strategies/scenarios/locate_changes_walk_basic.yaml
+++ b/git_upstream/tests/strategies/scenarios/locate_changes_walk_basic.yaml
@@ -35,5 +35,5 @@
    head: [master, B]
    upstream: [upstream/master, D]

-  expected_changes: [B]
+  expected-changes: [B]

--- a/git_upstream/tests/strategies/scenarios/locate_walk_additional_branch_multiple_imports.yaml
+++ b/git_upstream/tests/strategies/scenarios/locate_walk_additional_branch_multiple_imports.yaml
@@ -51,4 +51,4 @@
    head: [master, K]
    upstream: [upstream/master, M]

-  expected_changes: [D1, E1, J, K]
+  expected-changes: [D1, E1, J, K]
--- a/git_upstream/tests/strategies/scenarios/locate_walk_changes_approved_after_import_merge.yaml
+++ b/git_upstream/tests/strategies/scenarios/locate_walk_changes_approved_after_import_merge.yaml
@@ -59,4 +59,4 @@
    head: [master, K]
    upstream: [upstream/master, M]

-  expected_changes: [B1, C1, D1, O, J, K]
+  expected-changes: [B1, C1, D1, O, J, K]
--- a/git_upstream/tests/strategies/scenarios/locate_walk_changes_prior_to_import.yaml
+++ b/git_upstream/tests/strategies/scenarios/locate_walk_changes_prior_to_import.yaml
@@ -60,4 +60,4 @@
    head: [master, Q]
    upstream: [upstream/master, M]

-  expected_changes: [D1, E1, J, K, O, Q]
+  expected-changes: [D1, E1, J, K, O, Q]