Changeset 43620a3c in trunk


Ignore:
Timestamp:
2021-04-12T16:53:17Z (4 years ago)
Author:
Itamar Turner-Trauring <itamar@…>
Branches:
master
Children:
b0e6c86
Parents:
c3d2a26
Message:

Port to Python 3.

Location:
src/allmydata
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified src/allmydata/test/cli/test_backup.py

    rc3d2a26 r43620a3c  
     1"""
     2Ported to Python 3.
     3"""
     4from __future__ import absolute_import
     5from __future__ import division
     6from __future__ import print_function
     7from __future__ import unicode_literals
     8
    19from future.utils import PY2
    210if PY2:
     11    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
    312    import __builtin__ as builtins
    413else:
    … …  
    92101        def _check0(args):
    93102            (rc, out, err) = args
    94             self.failUnlessReallyEqual(err, "")
     103            self.assertEqual(len(err), 0)
    95104            self.failUnlessReallyEqual(rc, 0)
    96105            (
    … …  
    149158        def _check1(args):
    150159            (rc, out, err) = args
    151             self.failUnlessReallyEqual(err, "")
     160            self.assertEqual(len(err), 0)
    152161            self.failUnlessReallyEqual(rc, 0)
    153162            lines = out.split("\n")
    … …  
    155164            latest_uri = children["Latest"]
    156165            self.failUnless(latest_uri.startswith("URI:DIR2-CHK:"), latest_uri)
    157             childnames = children.keys()
     166            childnames = list(children.keys())
    158167            self.failUnlessReallyEqual(sorted(childnames), ["Archives", "Latest"])
    159168        d.addCallback(_check1)
    … …  
    161170        def _check2(args):
    162171            (rc, out, err) = args
    163             self.failUnlessReallyEqual(err, "")
     172            self.assertEqual(len(err), 0)
    164173            self.failUnlessReallyEqual(rc, 0)
    165174            self.failUnlessReallyEqual(sorted(out.split()), ["empty", "parent"])
    … …  
    168177        def _check2a(args):
    169178            (rc, out, err) = args
    170             self.failUnlessReallyEqual(err, "")
    171             self.failUnlessReallyEqual(rc, 0)
    172             self.failUnlessReallyEqual(out.strip(), "")
     179            self.assertEqual(len(err), 0)
     180            self.failUnlessReallyEqual(rc, 0)
     181            self.assertFalse(out.strip())
    173182        d.addCallback(_check2a)
    174183        d.addCallback(lambda res: self.do_cli("get", "tahoe:backups/Latest/parent/subdir/foo.txt"))
    175184        def _check3(args):
    176185            (rc, out, err) = args
    177             self.failUnlessReallyEqual(err, "")
    178             self.failUnlessReallyEqual(rc, 0)
    179             self.failUnlessReallyEqual(out, "foo")
     186            self.assertFalse(err)
     187            self.failUnlessReallyEqual(rc, 0)
     188            self.assertEqual(out, "foo")
    180189        d.addCallback(_check3)
    181190        d.addCallback(lambda res: self.do_cli("ls", "tahoe:backups/Archives"))
    182191        def _check4(args):
    183192            (rc, out, err) = args
    184             self.failUnlessReallyEqual(err, "")
     193            self.assertFalse(err)
    185194            self.failUnlessReallyEqual(rc, 0)
    186195            self.old_archives = out.split()
    … …  
    195204            # available
    196205            (rc, out, err) = args
    197             self.failUnlessReallyEqual(err, "")
     206            self.assertFalse(err)
    198207            self.failUnlessReallyEqual(rc, 0)
    199208            fu, fr, fs, dc, dr, ds = self.count_output(out)
    … …  
    227236            # re-use all of them too.
    228237            (rc, out, err) = args
    229             self.failUnlessReallyEqual(err, "")
     238            self.assertFalse(err)
    230239            self.failUnlessReallyEqual(rc, 0)
    231240            fu, fr, fs, dc, dr, ds = self.count_output(out)
    … …  
    244253        def _check5(args):
    245254            (rc, out, err) = args
    246             self.failUnlessReallyEqual(err, "")
     255            self.assertFalse(err)
    247256            self.failUnlessReallyEqual(rc, 0)
    248257            self.new_archives = out.split()
    … …  
    271280            # and upload the rest. None of the directories can be reused.
    272281            (rc, out, err) = args
    273             self.failUnlessReallyEqual(err, "")
     282            self.assertFalse(err)
    274283            self.failUnlessReallyEqual(rc, 0)
    275284            fu, fr, fs, dc, dr, ds = self.count_output(out)
    … …  
    287296        def _check6(args):
    288297            (rc, out, err) = args
    289             self.failUnlessReallyEqual(err, "")
     298            self.assertFalse(err)
    290299            self.failUnlessReallyEqual(rc, 0)
    291300            self.new_archives = out.split()
    … …  
    297306        def _check7(args):
    298307            (rc, out, err) = args
    299             self.failUnlessReallyEqual(err, "")
    300             self.failUnlessReallyEqual(rc, 0)
    301             self.failUnlessReallyEqual(out, "FOOF!")
     308            self.assertFalse(err)
     309            self.failUnlessReallyEqual(rc, 0)
     310            self.assertEqual(out, "FOOF!")
    302311            # the old snapshot should not be modified
    303312            return self.do_cli("get", "tahoe:backups/Archives/%s/parent/subdir/foo.txt" % self.old_archives[0])
    … …  
    305314        def _check8(args):
    306315            (rc, out, err) = args
    307             self.failUnlessReallyEqual(err, "")
    308             self.failUnlessReallyEqual(rc, 0)
    309             self.failUnlessReallyEqual(out, "foo")
     316            self.assertFalse(err)
     317            self.failUnlessReallyEqual(rc, 0)
     318            self.assertEqual(out, "foo")
    310319        d.addCallback(_check8)
    311320
    … …  
    594603            self.failUnlessReallyEqual(rc, 1)
    595604            self.failUnlessIn("error:", err)
    596             self.failUnlessReallyEqual(out, "")
     605            self.assertEqual(len(out), 0)
    597606        d.addCallback(_check)
    598607        return d
    … …  
    610619            self.failUnlessIn("error:", err)
    611620            self.failUnlessIn("nonexistent", err)
    612             self.failUnlessReallyEqual(out, "")
     621            self.assertEqual(len(out), 0)
    613622        d.addCallback(_check)
    614623        return d

  • TabularUnified src/allmydata/util/_python3.py

    rc3d2a26 r43620a3c  
    171171PORTED_TEST_MODULES = [
    172172    "allmydata.test.cli.test_alias",
     173    "allmydata.test.cli.test_backup",
    173174    "allmydata.test.cli.test_backupdb",
    174175    "allmydata.test.cli.test_create",
Note: See TracChangeset for help on using the changeset viewer.