code review 19280043: time: correct path to time zone zip file on Unix

time: correct path to time zone zip file on Unix

Most Unix systems have their own time zone data,
so we almost never get far enough in the list to
discover that we cannot fall back to the zip file.
Adjust testing to exercise the final fallback.

Plan 9 and Windows were already correct
(and are the main users of the zip file).

[rsc, 2013-10-29 17:19:21]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go/

[bradfitz, 2013-10-29 17:23:19]

LGTM
 On Oct 29, 2013 10:19 AM, <rsc@golang.org> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go/
>
>
> Description:
> time: correct path to time zone zip file on Unix
>
> Most Unix systems have their own time zone data,
> so we almost never get far enough in the list to
> discover that we cannot fall back to the zip file.
> Adjust testing to exercise the final fallback.
>
> Plan 9 and Windows were already correct
> (and are the main users of the zip file).
>
> Please review this at
https://codereview.appspot.**com/19280043/<https://codereview.appspot.com/192...
>
> Affected files (+35, -2 lines):
>   M src/pkg/time/export_test.go
>   M src/pkg/time/time_test.go
>   M src/pkg/time/zoneinfo_plan9.go
>   M src/pkg/time/zoneinfo_unix.go
>   M src/pkg/time/zoneinfo_windows.**go
>
>
> Index: src/pkg/time/export_test.go
> ==============================**==============================**=======
> --- a/src/pkg/time/export_test.go
> +++ b/src/pkg/time/export_test.go
> @@ -18,4 +18,7 @@
>         localOnce.Do(initTestingZone)
>  }
>
> -var ParseTimeZone = parseTimeZone
> +var (
> +       ForceZipFileForTesting = forceZipFileForTesting
> +       ParseTimeZone = parseTimeZone
> +)
> Index: src/pkg/time/time_test.go
> ==============================**==============================**=======
> --- a/src/pkg/time/time_test.go
> +++ b/src/pkg/time/time_test.go
> @@ -578,6 +578,16 @@
>         }
>  }
>
> +func TestLoadLocationZipFile(t *testing.T) {
> +       ForceZipFileForTesting(true)
> +       defer ForceZipFileForTesting(false)
> +
> +       _, err := LoadLocation("Australia/**Sydney")
> +       if err != nil {
> +               t.Fatal(err)
> +       }
> +}
> +
>  var rubyTests = []ParseTest{
>         {"RubyDate", RubyDate, "Thu Feb 04 21:00:57 -0800 2010", true,
> true, 1, 0},
>         // Ignore the time zone in the test. If it parses, it'll be OK.
> Index: src/pkg/time/zoneinfo_plan9.go
> ==============================**==============================**=======
> --- a/src/pkg/time/zoneinfo_plan9.**go
> +++ b/src/pkg/time/zoneinfo_plan9.**go
> @@ -154,3 +154,7 @@
>         }
>         return nil, errors.New("unknown time zone " + name)
>  }
> +
> +func forceZipFileForTesting(zipOnly bool) {
> +       // We only use the zip file anyway.
> +}
> Index: src/pkg/time/zoneinfo_unix.go
> ==============================**==============================**=======
> --- a/src/pkg/time/zoneinfo_unix.**go
> +++ b/src/pkg/time/zoneinfo_unix.**go
> @@ -32,7 +32,19 @@
>         "/usr/share/zoneinfo/",
>         "/usr/share/lib/zoneinfo/",
>         "/usr/lib/locale/TZ/",
> -       runtime.GOROOT() + "/lib/time/zoneinfo/",
> +       runtime.GOROOT() + "/lib/time/zoneinfo.zip",
> +}
> +
> +var origZoneDirs = zoneDirs
> +
> +func forceZipFileForTesting(zipOnly bool) {
> +       zoneDirs = make([]string, len(origZoneDirs))
> +       copy(zoneDirs, origZoneDirs)
> +       if zipOnly {
> +               for i := 0; i < len(zoneDirs)-1; i++ {
> +                       zoneDirs[i] = "/XXXNOEXIST"
> +               }
> +       }
>  }
>
>  func initLocal() {
> Index: src/pkg/time/zoneinfo_windows.**go
> ==============================**==============================**=======
> --- a/src/pkg/time/zoneinfo_**windows.go
> +++ b/src/pkg/time/zoneinfo_**windows.go
> @@ -264,3 +264,7 @@
>         }
>         return nil, errors.New("unknown time zone " + name)
>  }
> +
> +func forceZipFileForTesting(zipOnly bool) {
> +       // We only use the zip file anyway.
> +}
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to
golang-dev+unsubscribe@**googlegroups.com<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>

[rsc, 2013-10-29 21:11:55]

*** Submitted as https://code.google.com/p/go/source/detail?r=9d199c7582d6 ***

time: correct path to time zone zip file on Unix

Most Unix systems have their own time zone data,
so we almost never get far enough in the list to
discover that we cannot fall back to the zip file.
Adjust testing to exercise the final fallback.

Plan 9 and Windows were already correct
(and are the main users of the zip file).

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/19280043