#498 Fix several issues in cli tests
Merged 5 years ago by msuchy. Opened 5 years ago by frostyx.
copr/ frostyx/copr fix-cli-tests  into  master

file modified
+1 -1
@@ -135,7 +135,7 @@ 

                      if build_id in done:

                          continue

  

-                     build_details = self.client.build_proxy.get(build_id)

+                     build_details = self.client.build_proxy.get(build_id=build_id)

                      now = datetime.datetime.now()

                      if prevstatus[build_id] != build_details.state:

                          prevstatus[build_id] = build_details.state

file modified
+18 -16
@@ -357,16 +357,18 @@ 

          "--repo", "repo1", "--repo", "repo2",

          "--initial-pkgs", "pkg1"

      ])

- 

      stdout, stderr = capsys.readouterr()

  

-     project_proxy_add.assert_called_with(auto_prune=True,

-         ownername=None, persistent=False, projectname="foo", description="desc string",

-         instructions="instruction string", chroots=["f20", "f21"],

-         additional_repos=["repo1", "repo2"],

-         unlisted_on_hp=None, devel_mode=None, enable_net=False,

-         use_bootstrap_container=None)

- 

+     project_proxy_add.assert_called_once()

+     args, kwargs = project_proxy_add.call_args

+     assert kwargs == {

+         "auto_prune": True,

+         "ownername": None, "persistent": False, "projectname": "foo", "description": "desc string",

+         "instructions": "instruction string", "chroots": ["f20", "f21"],

+         "additional_repos": ["repo1", "repo2"],

+         "unlisted_on_hp": None, "devel_mode": None, "enable_net": False,

+         "use_bootstrap_container": None

+     }

      assert stdout == "New project was successfully created.\n"

  

  
@@ -498,18 +500,18 @@ 

          def incr(*args, **kwargs):

              self.stage += 1

  

-         def result_map(build_id, *args, **kwargs):

+         def result_map(*args, **kwargs):

              if self.stage == 0:

                  return Munch(state="pending")

              elif self.stage == 1:

                  smap = {0: "pending", 1: "starting", 2: "running"}

-                 return Munch(state=smap[build_id])

+                 return Munch(state=smap[kwargs["build_id"]])

              elif self.stage == 2:

                  smap = {0: "starting", 1: "running", 2: "succeeded"}

-                 return Munch(state=smap[build_id])

+                 return Munch(state=smap[kwargs["build_id"]])

              elif self.stage == 3:

                  smap = {0: "skipped", 1: "succeeded", 2: "succeeded"}

-                 return Munch(state=smap[build_id])

+                 return Munch(state=smap[kwargs["build_id"]])

  

          mock_time.sleep.side_effect = incr

          build_proxy_get.side_effect = result_map
@@ -535,18 +537,18 @@ 

          def incr(*args, **kwargs):

              self.stage += 1

  

-         def result_map(build_id, *args, **kwargs):

+         def result_map(*args, **kwargs):

              if self.stage == 0:

                  return Munch(state="pending")

              elif self.stage == 1:

                  smap = {0: "pending", 1: "starting", 2: "running"}

-                 return Munch(state=smap[build_id])

+                 return Munch(state=smap[kwargs["build_id"]])

              elif self.stage == 2:

                  smap = {0: "failed", 1: "running", 2: "succeeded"}

-                 return Munch(state=smap[build_id])

+                 return Munch(state=smap[kwargs["build_id"]])

              elif self.stage == 3:

                  smap = {0: "failed", 1: "failed", 2: "succeeded"}

-                 return Munch(state=smap[build_id])

+                 return Munch(state=smap[kwargs["build_id"]])

  

          mock_time.sleep.side_effect = incr

          build_proxy_get.side_effect = result_map

There is more information in commit details

rebased onto 70abfdd

5 years ago

Pull-Request has been merged by msuchy

5 years ago