[kudu] branch master updated: sentry_authz_provider-test: fix logical conflict

[awong]

This is an automated email from the ASF dual-hosted git repository.

awong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new 66485e1  sentry_authz_provider-test: fix logical conflict
66485e1 is described below

commit 66485e18697adf108f885d9d6bde4df0ea265b00
Author: Andrew Wong <aw...@apache.org>
AuthorDate: Tue Apr 9 13:54:43 2019 -0700

    sentry_authz_provider-test: fix logical conflict
    
    A couple changes landed around the same time, resulting in a logical
    conflict. There was a mismatch between using Kerberos in a test
    instantiation and the base test class.
    
    Change-Id: Id17fc116202d6ec369a5d31bf8eaee6b178a7d08
    Reviewed-on: http://gerrit.cloudera.org:8080/12971
    Reviewed-by: Adar Dembo <a...@cloudera.com>
    Reviewed-by: Alexey Serbin <aser...@cloudera.com>
    Tested-by: Andrew Wong <aw...@cloudera.com>
---
 src/kudu/master/sentry_authz_provider-test.cc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/kudu/master/sentry_authz_provider-test.cc 
b/src/kudu/master/sentry_authz_provider-test.cc
index 27bab0d..bb2df0a 100644
--- a/src/kudu/master/sentry_authz_provider-test.cc
+++ b/src/kudu/master/sentry_authz_provider-test.cc
@@ -664,14 +664,7 @@ INSTANTIATE_TEST_CASE_P(AuthzCombinations, 
TestAuthzHierarchy,
 
 // Test to verify the functionality of metrics in HA Sentry client used in
 // SentryAuthzProvider to communicate with Sentry.
-class TestSentryClientMetrics : public SentryAuthzProviderTest {
- public:
-  bool KerberosEnabled() const {
-    return false;
-  }
-};
-
-TEST_F(TestSentryClientMetrics, Basic) {
+TEST_F(SentryAuthzProviderTest, TestSentryClientMetrics) {
   ASSERT_EQ(0, GetTasksSuccessful());
   ASSERT_EQ(0, GetTasksFailedFatal());
   ASSERT_EQ(0, GetTasksFailedNonFatal());