Adapt unit tests to multisite changes

Author: avandras

patroni/ctl.py

@@ -1315,10 +1315,12 @@ def _do_failover_or_switchover(action: str, cluster_name: str, group: Optional[i
         raise PatroniCtlException('No candidates found to {0} to'.format(action))
 
     if candidate is None and not force:
-        if len(candidate_names) == 1:
-            candidate = click.prompt('Candidate ', type=str, default=candidate_names[0])
-        else:
-            candidate = click.prompt('Candidate ' + str(candidate_names), type=str, default='')
+        candidate = click.prompt('Candidate ' + str(candidate_names), type=str, default='')
+        # TODO: set candidate names reliably where there's only one
+        # if len(candidate_names) == 1:
+        #     candidate = click.prompt('Candidate ', type=str, default=candidate_names[0])
+        # else:
+        #     candidate = click.prompt('Candidate ' + str(candidate_names), type=str, default='')
 
     if action == 'failover' and not candidate:
         raise PatroniCtlException('Failover could be performed only to a specific candidate')

patroni/dcs/__init__.py

@@ -505,7 +505,7 @@ def from_node(version: _Version, value: Union[str, Dict[str, str]]) -> 'Failover
                 t = [a.strip() for a in value.split(':')]
                 leader = t[0]
                 candidate = t[1] if len(t) > 1 else None
-                return Failover(version, leader, candidate, None)
+                return Failover(version, leader, candidate, None, '')
         else:
             data = {}
 

tests/test_api.py

@@ -161,6 +161,8 @@ class MockPatroni(object):
     noloadbalance = PropertyMock(return_value=False)
     scheduled_restart = {'schedule': future_restart_time,
                          'postmaster_start_time': postgresql.postmaster_start_time()}
+    multisite = Mock()
+    multisite.is_active = PropertyMock(return_value=False)
 
     @staticmethod
     def sighup_handler():

tests/test_ctl.py

@@ -127,7 +127,7 @@ def test_output_members(self):
         with click.Context(click.Command('list')) as ctx:
             ctx.obj = {'__config': {}, '__mpp': get_mpp({})}
             scheduled_at = datetime.now(tzutc) + timedelta(seconds=600)
-            cluster = get_cluster_initialized_with_leader(Failover(1, 'foo', 'bar', scheduled_at))
+            cluster = get_cluster_initialized_with_leader(Failover(1, 'foo', 'bar', scheduled_at, ''))
             del cluster.members[1].data['conn_url']
             for fmt in ('pretty', 'json', 'yaml', 'topology'):
                 self.assertIsNone(output_members(cluster, name='abc', fmt=fmt))
@@ -572,7 +572,7 @@ def test_flush_switchover(self):
 
         scheduled_at = datetime.now(tzutc) + timedelta(seconds=600)
         with patch('patroni.dcs.AbstractDCS.get_cluster',
-                   Mock(return_value=get_cluster_initialized_with_leader(Failover(1, 'a', 'b', scheduled_at)))):
+                   Mock(return_value=get_cluster_initialized_with_leader(Failover(1, 'a', 'b', scheduled_at, '')))):
             result = self.runner.invoke(ctl, ['-k', 'flush', 'dummy', 'switchover'])
             assert result.output.startswith('Success: ')