openstack
/
monasca-common
Code Issues Proposed changes

Skip a test that fails if the server's time is UTC 

This was causing some builds to fail

Change-Id: I9d8b1b287768250861166d03306bf62d0889db5e
This commit is contained in:
Craig Bryant 2016-02-03 11:27:48 -07:00
parent acf2a3e779
commit 746b45e7d2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/monasca-common-util/src/test/java/monasca/common/util/ConversionsTest.java
View File

@ -17,8 +17,10 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals;
import java.math.BigDecimal;
import java.util.TimeZone;
import com.beust.jcommander.internal.Lists;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.testng.annotations.Test;
@ -59,8 +61,12 @@ public class ConversionsTest {
}
public void testDateTimeShouldNotEqualDifferentTZImplicit() {
final DateTime now = DateTime.now();
assertNotEquals(now, Conversions.variantToDateTime(now));
// This test fails if the timezone of the JVM is UTC so skip
// it in that case
if (TimeZone.getDefault() != TimeZone.getTimeZone("UTC")) {
final DateTime now = DateTime.now();
assertNotEquals(now, Conversions.variantToDateTime(now));
}
}
public void testDateTimeShouldEqualSameTZImplicit() {