[Python-modules-commits] [rpyc] 03/06: cherry pick: sort os.listdir() before comparing

Carl Suster arcresu-guest at moszumanska.debian.org
Thu Jan 12 06:00:36 UTC 2017


This is an automated email from the git hooks/post-receive script.

arcresu-guest pushed a commit to branch master
in repository rpyc.

commit f17e12745af3e55dbac265ab5b74e08e6be7a4c3
Author: Carl Suster <carl at contraflo.ws>
Date:   Mon Jan 9 18:43:09 2017 +1100

    cherry pick: sort os.listdir() before comparing
    
    Upstream commits:
    
      926fd0b07c53cadece8d8fae117311dafbd18e71
      tomerfiliba committed on 21 Oct 2014
      Tests: another fix for os.listdir
    
      aa9ee566359bc492f361db119ea4994da3ca07f5
      tomerfiliba committed on 21 Oct 2014
      test: fix test_remoting issue
    
    These are necessary to run the test suite.
    
    Origin: upstream, https://github.com/tomerfiliba/rpyc/compare/aa9ee566359bc492f361db119ea4994da3ca07f5~1...926fd0b07c53cadece8d8fae117311dafbd18e71
---
 tests/test_remoting.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_remoting.py b/tests/test_remoting.py
index 553cb1a..af4576c 100644
--- a/tests/test_remoting.py
+++ b/tests/test_remoting.py
@@ -25,10 +25,10 @@ class Test_Remoting(unittest.TestCase):
         os.mkdir(os.path.join(base1, "somedir1"))
 
         rpyc.classic.upload(self.conn, base1, base2)
-        self.assertEqual(os.listdir(base1), os.listdir(base2))
+        self.assertEqual(sorted(os.listdir(base1)), sorted(os.listdir(base2)))
 
         rpyc.classic.download(self.conn, base2, base3)
-        self.assertEqual(os.listdir(base2), os.listdir(base3))
+        self.assertEqual(sorted(os.listdir(base2)), sorted(os.listdir(base3)))
 
         shutil.rmtree(base)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/rpyc.git



More information about the Python-modules-commits mailing list