Change blacklist controller to take enableExpiry flag, only enable it for BaseURL blacklist

Author: robertbryer

src/streaming/controllers/BlacklistController.js

@@ -59,7 +59,7 @@ function BlackListController(config) {
         }
 
         const expiry = blacklistExpiry || settings.get().streaming.blacklistExpiryTime;
-        if (expiry && expiry > 0) {
+        if (config.enableExpiry && expiry && expiry > 0) {
             const timeoutId = setTimeout(() => {
                 remove(entry);
             }, expiry * 1000);

src/streaming/utils/BaseURLSelector.js

@@ -57,7 +57,8 @@ function BaseURLSelector() {
     function setup() {
         serviceLocationBlacklistController = BlacklistController(context).create({
             updateEventName: Events.SERVICE_LOCATION_BASE_URL_BLACKLIST_CHANGED,
-            addBlacklistEventName: Events.SERVICE_LOCATION_BASE_URL_BLACKLIST_ADD
+            addBlacklistEventName: Events.SERVICE_LOCATION_BASE_URL_BLACKLIST_ADD,
+            enableExpiry: true
         });
 
         basicSelector = BasicSelector(context).create({

test/unit/test/streaming/streaming.controllers.BlacklistController.js

@@ -126,7 +126,7 @@ describe('BlacklistController', function () {
     });
 
     it('should remove an entry after a content steering TTL blacklist expiry time has passed', () => {
-        const config = { updateEventName: '' };
+        const config = { updateEventName: '', enableExpiry: true };
         const blacklistController = BlacklistController(context).create(config);
         blacklistController.setContentSteeringBlacklistExpiry(60);
 
@@ -139,7 +139,7 @@ describe('BlacklistController', function () {
     });
 
     it('should remove an entry after a blacklist expiry time from settings has passed', () => {
-        const config = { updateEventName: '' };
+        const config = { updateEventName: '', enableExpiry: true };
         const blacklistController = BlacklistController(context).create(config);
         settings.update({streaming: { blacklistExpiryTime: 60 }});
 
@@ -150,4 +150,14 @@ describe('BlacklistController', function () {
         clock.tick(30 * 1000);
         expect(blacklistController.contains(SERVICE_LOCATION)).to.be.false;
     });
+
+    it('should not remove any entry if enableExpiry is not set', () => {
+        const config = { updateEventName: '' };
+        const blacklistController = BlacklistController(context).create(config);
+        settings.update({streaming: { blacklistExpiryTime: 60 }});
+
+        blacklistController.add(SERVICE_LOCATION);
+        clock.tick(60 * 1000);
+        expect(blacklistController.contains(SERVICE_LOCATION)).to.be.true;
+    });
 });