Merge pull request #10549 from Luap99/fix-9859

remote: always send resize before the container starts

3 files changed, 4 insertions, 5 deletions

diff --git a/test/apiv2/python/rest_api/fixtures/api_testcase.py b/test/apiv2/python/rest_api/fixtures/api_testcase.py
index 8b771774b..155e93928 100644
--- a/test/apiv2/python/rest_api/fixtures/api_testcase.py
+++ b/test/apiv2/python/rest_api/fixtures/api_testcase.py
@@ -49,7 +49,7 @@ class APITestCase(unittest.TestCase):
 
     def setUp(self):
         super().setUp()
-        APITestCase.podman.run("run", "alpine", "/bin/ls", check=True)
+        APITestCase.podman.run("run", "-d", "alpine", "top", check=True)
 
     def tearDown(self) -> None:
         APITestCase.podman.run("pod", "rm", "--all", "--force", check=True)
diff --git a/test/apiv2/python/rest_api/test_v2_0_0_container.py b/test/apiv2/python/rest_api/test_v2_0_0_container.py
index f67013117..b4b3af2df 100644
--- a/test/apiv2/python/rest_api/test_v2_0_0_container.py
+++ b/test/apiv2/python/rest_api/test_v2_0_0_container.py
@@ -12,7 +12,7 @@ class ContainerTestCase(APITestCase):
         r = requests.get(self.uri("/containers/json"), timeout=5)
         self.assertEqual(r.status_code, 200, r.text)
         obj = r.json()
-        self.assertEqual(len(obj), 0)
+        self.assertEqual(len(obj), 1)
 
     def test_list_all(self):
         r = requests.get(self.uri("/containers/json?all=true"))
@@ -36,7 +36,7 @@ class ContainerTestCase(APITestCase):
             self.assertId(r.content)
 
     def test_delete(self):
-        r = requests.delete(self.uri(self.resolve_container("/containers/{}")))
+        r = requests.delete(self.uri(self.resolve_container("/containers/{}?force=true")))
         self.assertEqual(r.status_code, 204, r.text)
 
     def test_stop(self):
diff --git a/test/system/450-interactive.bats b/test/system/450-interactive.bats
index a9bf52ee8..a2db39492 100644
--- a/test/system/450-interactive.bats
+++ b/test/system/450-interactive.bats
@@ -56,8 +56,7 @@ function teardown() {
     stty rows $rows cols $cols <$PODMAN_TEST_PTY
 
     # ...and make sure stty under podman reads that.
-    # FIXME: 'sleep 1' is needed for podman-remote; without it, there's
-    run_podman run -it --name mystty $IMAGE sh -c 'sleep 1;stty size' <$PODMAN_TEST_PTY
+    run_podman run -it --name mystty $IMAGE stty size <$PODMAN_TEST_PTY
     is "$output" "$rows $cols" "stty under podman reads the correct dimensions"
 }