Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

TimeZones: fix utc test #21393

Merged
merged 1 commit into from
Jan 7, 2020
Merged

TimeZones: fix utc test #21393

merged 1 commit into from
Jan 7, 2020

Conversation

ryantxu
Copy link
Member

@ryantxu ryantxu commented Jan 7, 2020

The changes in #21276 cause a test to fail when running in a non-utc timezone.

since circleci is in UTC we did not catch it automatically 馃槩

image

@ryantxu ryantxu requested a review from briangann January 7, 2020 21:46
Copy link
Contributor

@briangann briangann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@ryantxu ryantxu merged commit f7053e1 into master Jan 7, 2020
@ryantxu ryantxu deleted the fix-utc-tests branch January 7, 2020 22:01
ryantxu added a commit that referenced this pull request Jan 8, 2020
* grafana/master:
  TimeZones: fix utc test (#21393)
  Build: package all binaries for enterprise (#21381)
  Datasource: fixes prometheus datasource tests - adds align range
  CircleCI: Testing upgrade to CircleCI 2.1 (#21374)
  Storybook: Remove reference to jquery.flot.pie file from storybook config (#21378)
  Cloudwatch: Fixed crash when switching from cloudwatch data source (#21376)
  Docs: Added Squadcast notifications (#21372)
  Chore: upgrade d3 (#21368)
  Datasource: fix a bug where deleting data source will trigger save and test events (#21300)
  Forms: revamped select (#21092)
  Toolkit: add git log info to the plugin build report (#21344)
  Docs: Use https scheme for Grafana playground links (#21360)
  fix docs links (#21359)
  AddDatasourcePage: Refactoring & more Phantom plugins (#21261)
  Chore: Remove empty flot.pie file (#21356)
  Docs: Fix link (#21358)
  Docs: Fix InfluxDB templated dashboard link (#21343)
  Rendering: Fix panel PNG rendering when using sub url & serve_from_sub_path = true (#21306)
ryantxu added a commit that referenced this pull request Jan 8, 2020
* origin/master:
  Plugins: Use grafana-plugin-sdk-go v0.5.0 (#21116)
  UnitPicker: show custom units on load (#21397)
  Cloud Watch: Standardize Config Editor Implementation (#20489)
  CloudWatch: dimension_values templating fix (#21401)
  Docs: explain how to setup the apt repo without helpers (#21194)
  Build: prevent changes to pkg/extentions/main.go from throwing error on merge
  TimeZones: fix utc test (#21393)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants