Revision a06e2ad6 pithos/tools/pithos-test

b/pithos/tools/pithos-test
1831 1831
        self.client.create_container('φάκελος')
1832 1832
        o = self.upload_random_data('φάκελος', 'ο1')
1833 1833
        self.client.share_object('φάκελος', 'ο1', ['%s:σεφς' % get_user()])
1834
        chef = Pithos_Client(get_server(),
1834
        chef = Pithos_Client(get_url(),
1835 1835
                            '0009',
1836 1836
                            'διογένης',
1837 1837
                            get_api())
......
1892 1892
    
1893 1893
    def assert_read(self, authorized=[], any=False):
1894 1894
        for token, account in OTHER_ACCOUNTS.items():
1895
            cl = Pithos_Client(get_server(), token, account, get_api()) 
1895
            cl = Pithos_Client(get_url(), token, account, get_api()) 
1896 1896
            if account in authorized or any:
1897 1897
                self.assert_not_raises_fault(403, cl.retrieve_object_metadata,
1898 1898
                                             'c', 'o', account=get_user())
......
1903 1903
        #check inheritance
1904 1904
        o = self.upload_random_data('c', 'o/also-shared')
1905 1905
        for token, account in OTHER_ACCOUNTS.items():
1906
            cl = Pithos_Client(get_server(), token, account, get_api()) 
1906
            cl = Pithos_Client(get_url(), token, account, get_api()) 
1907 1907
            if account in authorized or any:
1908 1908
                self.assert_not_raises_fault(403, cl.retrieve_object_metadata,
1909 1909
                                             'c', 'o/also-shared', account=get_user())
......
1913 1913
    
1914 1914
    def assert_write(self, o_data, authorized=[], any=False):
1915 1915
        for token, account in OTHER_ACCOUNTS.items():
1916
            cl = Pithos_Client(get_server(), token, account, get_api()) 
1916
            cl = Pithos_Client(get_url(), token, account, get_api()) 
1917 1917
            new_data = get_random_data()
1918 1918
            if account in authorized or any:
1919 1919
                # test write access
......
1937 1937
        o = self.upload_random_data('c', 'o/also-shared')
1938 1938
        o_data = o['data']
1939 1939
        for token, account in OTHER_ACCOUNTS.items():
1940
            cl = Pithos_Client(get_server(), token, account, get_api()) 
1940
            cl = Pithos_Client(get_url(), token, account, get_api()) 
1941 1941
            new_data = get_random_data()
1942 1942
            if account in authorized or any:
1943 1943
                # test write access
......
2004 2004
        meta = self.client.retrieve_object_metadata('c', 'o')
2005 2005
        self.assertTrue('x-object-public' in meta)
2006 2006
        url = meta['x-object-public']
2007
        public_client = Pithos_Client(get_server(), get_auth(), get_user(), api='')
2007
        public_client = Pithos_Client(get_url(), get_auth(), get_user(), api='')
2008 2008
        data = public_client.get(url)[2]
2009 2009
        self.assertEqual(o_data, data)
2010 2010

  

Also available in: Unified diff