Changeset 5a3acc0 in trunk


Ignore:
Timestamp:
2011-01-14T04:03:27Z (15 years ago)
Author:
david-sarah <david-sarah@…>
Branches:
master
Children:
980fb0b
Parents:
f10a2c09
Message:

CLI: tests for ref #1305 (v2, remove spurious extra arg to create-alias in test)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified src/allmydata/test/test_cli.py

    rf10a2c09 r5a3acc0  
    499499    def test_create_alias(self):
    500500        help = str(cli.CreateAliasOptions())
    501         self.failUnless("create-alias ALIAS" in help, help)
     501        self.failUnless("create-alias ALIAS[:]" in help, help)
    502502
    503503    def test_add_aliases(self):
    504504        help = str(cli.AddAliasOptions())
    505         self.failUnless("add-alias ALIAS DIRCAP" in help, help)
     505        self.failUnless("add-alias ALIAS[:] DIRCAP" in help, help)
    506506
    507507
     
    531531            self.failUnless(aliases["tahoe"].startswith("URI:DIR2:"))
    532532        d.addCallback(_done)
    533         d.addCallback(lambda res: self.do_cli("create-alias", "two"))
     533        d.addCallback(lambda res: self.do_cli("create-alias", "two:"))
    534534
    535535        def _stash_urls(res):
     
    567567            self.failUnlessReallyEqual(aliases["two"], self.two_uri)
    568568        d.addCallback(_check_add_duplicate)
     569
     570        # check create-alias and add-alias with invalid aliases
     571        def _check_invalid((rc,stdout,stderr)):
     572            self.failIfEqual(rc, 0)
     573            self.failUnlessIn("cannot contain", stderr)
     574
     575        for invalid in ['foo:bar', 'foo bar', 'foobar::']:
     576            d.addCallback(lambda res: self.do_cli("create-alias", invalid))
     577            d.addCallback(_check_invalid)
     578            d.addCallback(lambda res: self.do_cli("add-alias", invalid, self.two_uri))
     579            d.addCallback(_check_invalid)
    569580
    570581        def _test_urls(junk):
Note: See TracChangeset for help on using the changeset viewer.