mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Increase timeouts to fix test on ARM
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
This commit is contained in:
		
							parent
							
								
									d395134b3d
								
							
						
					
					
						commit
						88c1bc10c4
					
				
					 5 changed files with 6 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -759,7 +759,7 @@ ADD test_file .`,
 | 
			
		|||
		close(errChan)
 | 
			
		||||
	}()
 | 
			
		||||
	select {
 | 
			
		||||
	case <-time.After(5 * time.Second):
 | 
			
		||||
	case <-time.After(15 * time.Second):
 | 
			
		||||
		c.Fatal("Build with adding to workdir timed out")
 | 
			
		||||
	case err := <-errChan:
 | 
			
		||||
		c.Assert(err, check.IsNil)
 | 
			
		||||
| 
						 | 
				
			
			@ -1408,7 +1408,7 @@ COPY test_file .`,
 | 
			
		|||
		close(errChan)
 | 
			
		||||
	}()
 | 
			
		||||
	select {
 | 
			
		||||
	case <-time.After(5 * time.Second):
 | 
			
		||||
	case <-time.After(15 * time.Second):
 | 
			
		||||
		c.Fatal("Build with adding to workdir timed out")
 | 
			
		||||
	case err := <-errChan:
 | 
			
		||||
		c.Assert(err, check.IsNil)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ func (s *DockerSuite) TestEventsUntag(c *check.C) {
 | 
			
		|||
	dockerCmd(c, "rmi", "utest:tag1")
 | 
			
		||||
	dockerCmd(c, "rmi", "utest:tag2")
 | 
			
		||||
	eventsCmd := exec.Command(dockerBinary, "events", "--since=1")
 | 
			
		||||
	out, exitCode, _, err := runCommandWithOutputForDuration(eventsCmd, time.Duration(time.Millisecond*500))
 | 
			
		||||
	out, exitCode, _, err := runCommandWithOutputForDuration(eventsCmd, time.Duration(time.Millisecond*2500))
 | 
			
		||||
	c.Assert(err, checker.IsNil)
 | 
			
		||||
	c.Assert(exitCode, checker.Equals, 0, check.Commentf("Failed to get events"))
 | 
			
		||||
	events := strings.Split(out, "\n")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -35,7 +35,7 @@ func (s *DockerSuite) TestExecInteractiveStdinClose(c *check.C) {
 | 
			
		|||
		c.Assert(err, checker.IsNil)
 | 
			
		||||
		output := b.String()
 | 
			
		||||
		c.Assert(strings.TrimSpace(output), checker.Equals, "hello")
 | 
			
		||||
	case <-time.After(1 * time.Second):
 | 
			
		||||
	case <-time.After(5 * time.Second):
 | 
			
		||||
		c.Fatal("timed out running docker exec")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ func (s *DockerSuite) TestStartAttachReturnsOnError(c *check.C) {
 | 
			
		|||
	select {
 | 
			
		||||
	case err := <-ch:
 | 
			
		||||
		c.Assert(err, check.IsNil)
 | 
			
		||||
	case <-time.After(time.Second):
 | 
			
		||||
	case <-time.After(5 * time.Second):
 | 
			
		||||
		c.Fatalf("Attach did not exit properly")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1517,7 +1517,7 @@ func setupRegistry(c *check.C) *testRegistryV2 {
 | 
			
		|||
	c.Assert(err, check.IsNil)
 | 
			
		||||
 | 
			
		||||
	// Wait for registry to be ready to serve requests.
 | 
			
		||||
	for i := 0; i != 5; i++ {
 | 
			
		||||
	for i := 0; i != 50; i++ {
 | 
			
		||||
		if err = reg.Ping(); err == nil {
 | 
			
		||||
			break
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue