Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Zhang Wei authored on 2015/05/25 15:51:10... | ... |
@@ -611,7 +611,7 @@ ONBUILD ENTRYPOINT ["echo"]`, |
611 | 611 |
|
612 | 612 |
} |
613 | 613 |
|
614 |
-func (s *DockerSuite) TestBuildCacheADD(c *check.C) { |
|
614 |
+func (s *DockerSuite) TestBuildCacheAdd(c *check.C) { |
|
615 | 615 |
name := "testbuildtwoimageswithadd" |
616 | 616 |
server, err := fakeStorage(map[string]string{ |
617 | 617 |
"robots.txt": "hello", |
... | ... |
@@ -2674,7 +2674,7 @@ func (s *DockerSuite) TestBuildConditionalCache(c *check.C) { |
2674 | 2674 |
} |
2675 | 2675 |
} |
2676 | 2676 |
|
2677 |
-func (s *DockerSuite) TestBuildADDLocalFileWithCache(c *check.C) { |
|
2677 |
+func (s *DockerSuite) TestBuildAddLocalFileWithCache(c *check.C) { |
|
2678 | 2678 |
name := "testbuildaddlocalfilewithcache" |
2679 | 2679 |
name2 := "testbuildaddlocalfilewithcache2" |
2680 | 2680 |
dockerfile := ` |
... | ... |
@@ -2702,7 +2702,7 @@ func (s *DockerSuite) TestBuildADDLocalFileWithCache(c *check.C) { |
2702 | 2702 |
} |
2703 | 2703 |
} |
2704 | 2704 |
|
2705 |
-func (s *DockerSuite) TestBuildADDMultipleLocalFileWithCache(c *check.C) { |
|
2705 |
+func (s *DockerSuite) TestBuildAddMultipleLocalFileWithCache(c *check.C) { |
|
2706 | 2706 |
name := "testbuildaddmultiplelocalfilewithcache" |
2707 | 2707 |
name2 := "testbuildaddmultiplelocalfilewithcache2" |
2708 | 2708 |
dockerfile := ` |
... | ... |
@@ -2730,7 +2730,7 @@ func (s *DockerSuite) TestBuildADDMultipleLocalFileWithCache(c *check.C) { |
2730 | 2730 |
} |
2731 | 2731 |
} |
2732 | 2732 |
|
2733 |
-func (s *DockerSuite) TestBuildADDLocalFileWithoutCache(c *check.C) { |
|
2733 |
+func (s *DockerSuite) TestBuildAddLocalFileWithoutCache(c *check.C) { |
|
2734 | 2734 |
name := "testbuildaddlocalfilewithoutcache" |
2735 | 2735 |
name2 := "testbuildaddlocalfilewithoutcache2" |
2736 | 2736 |
dockerfile := ` |
... | ... |
@@ -2788,7 +2788,7 @@ func (s *DockerSuite) TestBuildCopyDirButNotFile(c *check.C) { |
2788 | 2788 |
} |
2789 | 2789 |
} |
2790 | 2790 |
|
2791 |
-func (s *DockerSuite) TestBuildADDCurrentDirWithCache(c *check.C) { |
|
2791 |
+func (s *DockerSuite) TestBuildAddCurrentDirWithCache(c *check.C) { |
|
2792 | 2792 |
name := "testbuildaddcurrentdirwithcache" |
2793 | 2793 |
name2 := name + "2" |
2794 | 2794 |
name3 := name + "3" |
... | ... |
@@ -2852,7 +2852,7 @@ func (s *DockerSuite) TestBuildADDCurrentDirWithCache(c *check.C) { |
2852 | 2852 |
} |
2853 | 2853 |
} |
2854 | 2854 |
|
2855 |
-func (s *DockerSuite) TestBuildADDCurrentDirWithoutCache(c *check.C) { |
|
2855 |
+func (s *DockerSuite) TestBuildAddCurrentDirWithoutCache(c *check.C) { |
|
2856 | 2856 |
name := "testbuildaddcurrentdirwithoutcache" |
2857 | 2857 |
name2 := "testbuildaddcurrentdirwithoutcache2" |
2858 | 2858 |
dockerfile := ` |
... | ... |
@@ -2879,7 +2879,7 @@ func (s *DockerSuite) TestBuildADDCurrentDirWithoutCache(c *check.C) { |
2879 | 2879 |
} |
2880 | 2880 |
} |
2881 | 2881 |
|
2882 |
-func (s *DockerSuite) TestBuildADDRemoteFileWithCache(c *check.C) { |
|
2882 |
+func (s *DockerSuite) TestBuildAddRemoteFileWithCache(c *check.C) { |
|
2883 | 2883 |
name := "testbuildaddremotefilewithcache" |
2884 | 2884 |
server, err := fakeStorage(map[string]string{ |
2885 | 2885 |
"baz": "hello", |
... | ... |
@@ -2910,7 +2910,7 @@ func (s *DockerSuite) TestBuildADDRemoteFileWithCache(c *check.C) { |
2910 | 2910 |
} |
2911 | 2911 |
} |
2912 | 2912 |
|
2913 |
-func (s *DockerSuite) TestBuildADDRemoteFileWithoutCache(c *check.C) { |
|
2913 |
+func (s *DockerSuite) TestBuildAddRemoteFileWithoutCache(c *check.C) { |
|
2914 | 2914 |
name := "testbuildaddremotefilewithoutcache" |
2915 | 2915 |
name2 := "testbuildaddremotefilewithoutcache2" |
2916 | 2916 |
server, err := fakeStorage(map[string]string{ |
... | ... |
@@ -2942,7 +2942,7 @@ func (s *DockerSuite) TestBuildADDRemoteFileWithoutCache(c *check.C) { |
2942 | 2942 |
} |
2943 | 2943 |
} |
2944 | 2944 |
|
2945 |
-func (s *DockerSuite) TestBuildADDRemoteFileMTime(c *check.C) { |
|
2945 |
+func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) { |
|
2946 | 2946 |
name := "testbuildaddremotefilemtime" |
2947 | 2947 |
name2 := name + "2" |
2948 | 2948 |
name3 := name + "3" |
... | ... |
@@ -3013,7 +3013,7 @@ func (s *DockerSuite) TestBuildADDRemoteFileMTime(c *check.C) { |
3013 | 3013 |
} |
3014 | 3014 |
} |
3015 | 3015 |
|
3016 |
-func (s *DockerSuite) TestBuildADDLocalAndRemoteFilesWithCache(c *check.C) { |
|
3016 |
+func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithCache(c *check.C) { |
|
3017 | 3017 |
name := "testbuildaddlocalandremotefilewithcache" |
3018 | 3018 |
server, err := fakeStorage(map[string]string{ |
3019 | 3019 |
"baz": "hello", |
... | ... |
@@ -3095,7 +3095,7 @@ func (s *DockerSuite) TestBuildNoContext(c *check.C) { |
3095 | 3095 |
} |
3096 | 3096 |
|
3097 | 3097 |
// TODO: TestCaching |
3098 |
-func (s *DockerSuite) TestBuildADDLocalAndRemoteFilesWithoutCache(c *check.C) { |
|
3098 |
+func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithoutCache(c *check.C) { |
|
3099 | 3099 |
name := "testbuildaddlocalandremotefilewithoutcache" |
3100 | 3100 |
name2 := "testbuildaddlocalandremotefilewithoutcache2" |
3101 | 3101 |
server, err := fakeStorage(map[string]string{ |
... | ... |
@@ -3215,7 +3215,7 @@ func (s *DockerSuite) TestBuildForbiddenContextPath(c *check.C) { |
3215 | 3215 |
|
3216 | 3216 |
} |
3217 | 3217 |
|
3218 |
-func (s *DockerSuite) TestBuildADDFileNotFound(c *check.C) { |
|
3218 |
+func (s *DockerSuite) TestBuildAddFileNotFound(c *check.C) { |
|
3219 | 3219 |
name := "testbuildaddnotfound" |
3220 | 3220 |
ctx, err := fakeContext(`FROM scratch |
3221 | 3221 |
ADD foo /usr/local/bar`, |