Timing was all backwards.

gocd-contrib · Aug 11, 2016 · 4f34c4c · 4f34c4c
1 parent 013ad8f
commit 4f34c4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/cd/go/contrib/elasticagents/docker/DockerContainers.java b/src/main/java/cd/go/contrib/elasticagents/docker/DockerContainers.java
@@ -76,7 +76,7 @@ public Agents instancesCreatedAfterTimeout(PluginSettings settings, Agents agent
                 continue;
             }
 
-            if (instance.createdAt().plus(settings.getAutoRegisterPeriod()).isAfter(clock.now())) {
+            if (clock.now().isAfter(instance.createdAt().plus(settings.getAutoRegisterPeriod()))) {
                 oldAgents.add(agent);
             }
         }
@@ -115,7 +115,7 @@ private DockerContainers unregisteredAfterTimeout(PluginSettings settings, Agent
             ContainerInfo containerInfo = docker(settings).inspectContainer(containerName);
             DateTime dateTimeCreated = new DateTime(containerInfo.created());
 
-            if (dateTimeCreated.plus(period).isBefore(clock.now())) {
+            if (clock.now().isAfter(dateTimeCreated.plus(period))) {
                 unregisteredContainers.register(DockerContainer.fromContainerInfo(containerInfo));
             }
         }

diff --git a/src/test/java/cd/go/contrib/elasticagents/docker/DockerContainersTest.java b/src/test/java/cd/go/contrib/elasticagents/docker/DockerContainersTest.java
@@ -89,37 +89,35 @@ public void shouldNotRefreshAllAgentInstancesAgainAfterTheStartUp() throws Excep
     }
 
     @Test
-    public void shouldListTheContainerIfItIsCreatedBeforeTimeout() throws Exception {
-        dockerContainers.clock = new Clock.TestClock().forward(Period.minutes(9));
-
+    public void shouldNotListTheContainerIfItIsCreatedBeforeTimeout() throws Exception {
         DockerContainer container = DockerContainer.create(request, settings, docker);
         containers.add(container.name());
 
         PluginRequest pluginRequest = mock(PluginRequest.class);
         when(pluginRequest.getPluginSettings()).thenReturn(createSettings());
 
+        dockerContainers.clock = new Clock.TestClock().forward(Period.minutes(9));
         dockerContainers.refreshAll(pluginRequest);
 
         Agents filteredDockerContainers = dockerContainers.instancesCreatedAfterTimeout(createSettings(), new Agents(Arrays.asList(new Agent(container.name(), null, null, null))));
 
-        assertTrue(filteredDockerContainers.containsAgentWithId(container.name()));
+        assertFalse(filteredDockerContainers.containsAgentWithId(container.name()));
     }
 
     @Test
-    public void shouldNotListTheContainerIfItIsNotCreatedBeforeTimeout() throws Exception {
-        dockerContainers.clock = new Clock.TestClock().forward(Period.minutes(11));
-
+    public void shouldListTheContainerIfItIsNotCreatedBeforeTimeout() throws Exception {
         DockerContainer container = DockerContainer.create(request, settings, docker);
         containers.add(container.name());
 
         PluginRequest pluginRequest = mock(PluginRequest.class);
         when(pluginRequest.getPluginSettings()).thenReturn(createSettings());
 
+        dockerContainers.clock = new Clock.TestClock().forward(Period.minutes(11));
         dockerContainers.refreshAll(pluginRequest);
 
         Agents filteredDockerContainers = dockerContainers.instancesCreatedAfterTimeout(createSettings(), new Agents(Arrays.asList(new Agent(container.name(), null, null, null))));
 
-        assertFalse(filteredDockerContainers.containsAgentWithId(container.name()));
+        assertTrue(filteredDockerContainers.containsAgentWithId(container.name()));
     }
 
     @Test