Browse code

Windows: Port api_containers_test tests

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2016/08/31 06:15:33
Showing 1 changed files
... ...
@@ -535,8 +535,6 @@ func (s *DockerSuite) TestContainerApiCreateMultipleNetworksConfig(c *check.C) {
535 535
 }
536 536
 
537 537
 func (s *DockerSuite) TestContainerApiCreateWithHostName(c *check.C) {
538
-	// TODO Windows: Port this test once hostname is supported
539
-	testRequires(c, DaemonIsLinux)
540 538
 	hostName := "test-host"
541 539
 	config := map[string]interface{}{
542 540
 		"Image":    "busybox",
... ...
@@ -560,8 +558,6 @@ func (s *DockerSuite) TestContainerApiCreateWithHostName(c *check.C) {
560 560
 }
561 561
 
562 562
 func (s *DockerSuite) TestContainerApiCreateWithDomainName(c *check.C) {
563
-	// TODO Windows: Port this test once domain name is supported
564
-	testRequires(c, DaemonIsLinux)
565 563
 	domainName := "test-domain"
566 564
 	config := map[string]interface{}{
567 565
 		"Image":      "busybox",
... ...
@@ -766,9 +762,6 @@ func (s *DockerSuite) TestContainerApiInvalidRestartPolicyPositiveRetryCount(c *
766 766
 // Issue 7941 - test to make sure a "null" in JSON is just ignored.
767 767
 // W/o this fix a null in JSON would be parsed into a string var as "null"
768 768
 func (s *DockerSuite) TestContainerApiPostCreateNull(c *check.C) {
769
-	// TODO Windows to Windows CI. Bit of this with alternate fields checked
770
-	// can probably be ported.
771
-	testRequires(c, DaemonIsLinux)
772 769
 	config := `{
773 770
 		"Hostname":"",
774 771
 		"Domainname":"",
... ...
@@ -833,8 +826,6 @@ func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) {
833 833
 }
834 834
 
835 835
 func (s *DockerSuite) TestContainerApiRename(c *check.C) {
836
-	// TODO Windows: Debug why this sometimes fails on TP5. For now, leave disabled
837
-	testRequires(c, DaemonIsLinux)
838 836
 	out, _ := dockerCmd(c, "run", "--name", "TestContainerApiRename", "-d", "busybox", "sh")
839 837
 
840 838
 	containerID := strings.TrimSpace(out)
... ...
@@ -947,8 +938,6 @@ func (s *DockerSuite) TestContainerApiWait(c *check.C) {
947 947
 }
948 948
 
949 949
 func (s *DockerSuite) TestContainerApiCopyNotExistsAnyMore(c *check.C) {
950
-	// TODO Windows to Windows CI. This can be ported.
951
-	testRequires(c, DaemonIsLinux)
952 950
 	name := "test-container-api-copy"
953 951
 	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
954 952
 
... ...
@@ -962,8 +951,7 @@ func (s *DockerSuite) TestContainerApiCopyNotExistsAnyMore(c *check.C) {
962 962
 }
963 963
 
964 964
 func (s *DockerSuite) TestContainerApiCopyPre124(c *check.C) {
965
-	// TODO Windows to Windows CI. This can be ported.
966
-	testRequires(c, DaemonIsLinux)
965
+
967 966
 	name := "test-container-api-copy"
968 967
 	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
969 968
 
... ...
@@ -993,8 +981,6 @@ func (s *DockerSuite) TestContainerApiCopyPre124(c *check.C) {
993 993
 }
994 994
 
995 995
 func (s *DockerSuite) TestContainerApiCopyResourcePathEmptyPr124(c *check.C) {
996
-	// TODO Windows to Windows CI. This can be ported.
997
-	testRequires(c, DaemonIsLinux)
998 996
 	name := "test-container-api-copy-resource-empty"
999 997
 	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
1000 998
 
... ...
@@ -1009,8 +995,6 @@ func (s *DockerSuite) TestContainerApiCopyResourcePathEmptyPr124(c *check.C) {
1009 1009
 }
1010 1010
 
1011 1011
 func (s *DockerSuite) TestContainerApiCopyResourcePathNotFoundPre124(c *check.C) {
1012
-	// TODO Windows to Windows CI. This can be ported.
1013
-	testRequires(c, DaemonIsLinux)
1014 1012
 	name := "test-container-api-copy-resource-not-found"
1015 1013
 	dockerCmd(c, "run", "--name", name, "busybox")
1016 1014
 
... ...
@@ -1126,9 +1110,6 @@ func (s *DockerSuite) TestContainerApiDeleteRemoveVolume(c *check.C) {
1126 1126
 
1127 1127
 // Regression test for https://github.com/docker/docker/issues/6231
1128 1128
 func (s *DockerSuite) TestContainerApiChunkedEncoding(c *check.C) {
1129
-	// TODO Windows CI: This can be ported
1130
-	testRequires(c, DaemonIsLinux)
1131
-
1132 1129
 	conn, err := sockConn(time.Duration(10*time.Second), "")
1133 1130
 	c.Assert(err, checker.IsNil)
1134 1131
 	client := httputil.NewClientConn(conn, nil)