kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
moby--moby/builder/dockerfile/dispatchers_windows_test.go

41 lines
1.5 KiB
Go
Raw Normal View History

Windows: Reduce CLI time, move some to unit tests Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-02 21:33:59 -04:00
// +build windows
package dockerfile
import "testing"
func TestNormaliseWorkdir(t *testing.T) {
tests := []struct{ current, requested, expected, etext string }{
{``, ``, ``, `cannot normalise nothing`},
Use `filepath.Clean` in `normaliseWorkdir` for windows As is seem in the comment of `normaliseWorkdir` for windows: ``` ... // WORKDIR c:\\foo --> C:\foo // WORKDIR \\foo --> C:\foo ... ``` However, this is not the case in the current implementation because `filepath.FromSlash` is used and `FromSlash` does not replace multiple separator with a single one (`file.Clean` does). So `normaliseWorkdir` does not truly normalize workdir. This fix changes the implementation of `normaliseWorkdir` and use `filepath.Clean` instead of `filepath.FromSlash`. Additional test cases have been added to the unit test. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-21 00:46:22 -04:00
{``, `C:`, ``, `C:. is not a directory. If you are specifying a drive letter, please add a trailing '\'`},
{``, `C:.`, ``, `C:. is not a directory. If you are specifying a drive letter, please add a trailing '\'`},
{`c:`, `\a`, ``, `c:. is not a directory. If you are specifying a drive letter, please add a trailing '\'`},
{`c:.`, `\a`, ``, `c:. is not a directory. If you are specifying a drive letter, please add a trailing '\'`},
Windows: Reduce CLI time, move some to unit tests Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-02 21:33:59 -04:00
{``, `a`, `C:\a`, ``},
{``, `c:\foo`, `C:\foo`, ``},
Use `filepath.Clean` in `normaliseWorkdir` for windows As is seem in the comment of `normaliseWorkdir` for windows: ``` ... // WORKDIR c:\\foo --> C:\foo // WORKDIR \\foo --> C:\foo ... ``` However, this is not the case in the current implementation because `filepath.FromSlash` is used and `FromSlash` does not replace multiple separator with a single one (`file.Clean` does). So `normaliseWorkdir` does not truly normalize workdir. This fix changes the implementation of `normaliseWorkdir` and use `filepath.Clean` instead of `filepath.FromSlash`. Additional test cases have been added to the unit test. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-21 00:46:22 -04:00
{``, `c:\\foo`, `C:\foo`, ``},
Windows: Reduce CLI time, move some to unit tests Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-02 21:33:59 -04:00
{``, `\foo`, `C:\foo`, ``},
Use `filepath.Clean` in `normaliseWorkdir` for windows As is seem in the comment of `normaliseWorkdir` for windows: ``` ... // WORKDIR c:\\foo --> C:\foo // WORKDIR \\foo --> C:\foo ... ``` However, this is not the case in the current implementation because `filepath.FromSlash` is used and `FromSlash` does not replace multiple separator with a single one (`file.Clean` does). So `normaliseWorkdir` does not truly normalize workdir. This fix changes the implementation of `normaliseWorkdir` and use `filepath.Clean` instead of `filepath.FromSlash`. Additional test cases have been added to the unit test. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-21 00:46:22 -04:00
{``, `\\foo`, `C:\foo`, ``},
Windows: Reduce CLI time, move some to unit tests Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-02 21:33:59 -04:00
{``, `/foo`, `C:\foo`, ``},
{``, `C:/foo`, `C:\foo`, ``},
{`C:\foo`, `bar`, `C:\foo\bar`, ``},
{`C:\foo`, `/bar`, `C:\bar`, ``},
{`C:\foo`, `\bar`, `C:\bar`, ``},
}
for _, i := range tests {
r, e := normaliseWorkdir(i.current, i.requested)
if i.etext != "" && e == nil {
Use `filepath.Clean` in `normaliseWorkdir` for windows As is seem in the comment of `normaliseWorkdir` for windows: ``` ... // WORKDIR c:\\foo --> C:\foo // WORKDIR \\foo --> C:\foo ... ``` However, this is not the case in the current implementation because `filepath.FromSlash` is used and `FromSlash` does not replace multiple separator with a single one (`file.Clean` does). So `normaliseWorkdir` does not truly normalize workdir. This fix changes the implementation of `normaliseWorkdir` and use `filepath.Clean` instead of `filepath.FromSlash`. Additional test cases have been added to the unit test. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-21 00:46:22 -04:00
t.Fatalf("TestNormaliseWorkingDir Expected error %s for '%s' '%s', got no error", i.etext, i.current, i.requested)
Windows: Reduce CLI time, move some to unit tests Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-02 21:33:59 -04:00
}
if i.etext != "" && e.Error() != i.etext {
Use `filepath.Clean` in `normaliseWorkdir` for windows As is seem in the comment of `normaliseWorkdir` for windows: ``` ... // WORKDIR c:\\foo --> C:\foo // WORKDIR \\foo --> C:\foo ... ``` However, this is not the case in the current implementation because `filepath.FromSlash` is used and `FromSlash` does not replace multiple separator with a single one (`file.Clean` does). So `normaliseWorkdir` does not truly normalize workdir. This fix changes the implementation of `normaliseWorkdir` and use `filepath.Clean` instead of `filepath.FromSlash`. Additional test cases have been added to the unit test. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-21 00:46:22 -04:00
t.Fatalf("TestNormaliseWorkingDir Expected error %s for '%s' '%s', got %s", i.etext, i.current, i.requested, e.Error())
Windows: Reduce CLI time, move some to unit tests Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-02 21:33:59 -04:00
}
if r != i.expected {
Use `filepath.Clean` in `normaliseWorkdir` for windows As is seem in the comment of `normaliseWorkdir` for windows: ``` ... // WORKDIR c:\\foo --> C:\foo // WORKDIR \\foo --> C:\foo ... ``` However, this is not the case in the current implementation because `filepath.FromSlash` is used and `FromSlash` does not replace multiple separator with a single one (`file.Clean` does). So `normaliseWorkdir` does not truly normalize workdir. This fix changes the implementation of `normaliseWorkdir` and use `filepath.Clean` instead of `filepath.FromSlash`. Additional test cases have been added to the unit test. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-21 00:46:22 -04:00
t.Fatalf("TestNormaliseWorkingDir Expected '%s' for '%s' '%s', got '%s'", i.expected, i.current, i.requested, r)
Windows: Reduce CLI time, move some to unit tests Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-02 21:33:59 -04:00
}
}
}
Copy permalink