Revision 5207c784 kamaki/cli/commands/test_cli.py

b/kamaki/cli/commands/test_cli.py
44 44

  
45 45
class _test_init(_command_init):
46 46

  
47
    def main(self, client, method=None):
47
    def _run(self, client, method=None):
48 48
        if method:
49 49
            tests._main([client, method], config=self.config)
50 50
        else:
51 51
            tests._main([client], config=self.config)
52 52

  
53
    def main(self, client, method=None):
54
        return self._run(client, method)
55

  
53 56

  
54 57
@command(test_cmds)
55 58
class test_error(_test_init):
......
87 90
    @errors.generic.all
88 91
    def _run(self):
89 92
        for client in ('pithos', 'cyclades', 'image', 'astakos'):
90
            super(self.__class__, self).main(client)
93
            super(self.__class__, self)._run(client)
91 94

  
92 95
    def main(self):
93 96
        self._run()
......
99 102

  
100 103
    @errors.generic.all
101 104
    def _run(self, method=None):
102
        super(self.__class__, self).main('pithos', method)
105
        super(self.__class__, self)._run('pithos', method)
103 106

  
104 107
    def main(self, method=None):
105 108
        self._run(method)
......
111 114

  
112 115
    @errors.generic.all
113 116
    def _run(self, method=None):
114
        super(self.__class__, self).main('cyclades', method)
117
        super(self.__class__, self)._run('cyclades', method)
115 118

  
116 119
    def main(self, method=None):
117 120
        self._run(method)
......
123 126

  
124 127
    @errors.generic.all
125 128
    def _run(self, method=None):
126
        super(self.__class__, self).main('image', method)
129
        super(self.__class__, self)._run('image', method)
127 130

  
128 131
    def main(self, method=None):
129 132
        self._run(method)
......
135 138

  
136 139
    @errors.generic.all
137 140
    def _run(self, method=None):
138
        super(self.__class__, self).main('astakos', method)
141
        super(self.__class__, self)._run('astakos', method)
139 142

  
140 143
    def main(self, method=None):
141 144
        self._run(method)

Also available in: Unified diff